tests: reference `seen` wherever `pu` was referenced

As our test suite partially reflects how we work in the Git project, it
is natural that the branch name `pu` was used in a couple places.

Since that branch was renamed to `seen`, let's use the new name
consistently.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2020-06-25 12:18:59 +00:00 коммит произвёл Junio C Hamano
Родитель 77dc6049c3
Коммит 6dca5dbf93
3 изменённых файлов: 14 добавлений и 14 удалений

Просмотреть файл

@ -988,7 +988,7 @@ test_expect_success 'remote set-branches' '
+refs/heads/maint:refs/remotes/scratch/maint +refs/heads/maint:refs/remotes/scratch/maint
+refs/heads/master:refs/remotes/scratch/master +refs/heads/master:refs/remotes/scratch/master
+refs/heads/next:refs/remotes/scratch/next +refs/heads/next:refs/remotes/scratch/next
+refs/heads/pu:refs/remotes/scratch/pu +refs/heads/seen:refs/remotes/scratch/seen
+refs/heads/t/topic:refs/remotes/scratch/t/topic +refs/heads/t/topic:refs/remotes/scratch/t/topic
EOF EOF
sort <<-\EOF >expect.setup-ffonly && sort <<-\EOF >expect.setup-ffonly &&
@ -998,7 +998,7 @@ test_expect_success 'remote set-branches' '
sort <<-\EOF >expect.respect-ffonly && sort <<-\EOF >expect.respect-ffonly &&
refs/heads/master:refs/remotes/scratch/master refs/heads/master:refs/remotes/scratch/master
+refs/heads/next:refs/remotes/scratch/next +refs/heads/next:refs/remotes/scratch/next
+refs/heads/pu:refs/remotes/scratch/pu +refs/heads/seen:refs/remotes/scratch/seen
EOF EOF
git clone .git/ setbranches && git clone .git/ setbranches &&
@ -1016,7 +1016,7 @@ test_expect_success 'remote set-branches' '
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.replace && sort <config-result >../actual.replace &&
git remote set-branches --add scratch pu t/topic && git remote set-branches --add scratch seen t/topic &&
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.add-two && sort <config-result >../actual.add-two &&
@ -1028,7 +1028,7 @@ test_expect_success 'remote set-branches' '
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.setup-ffonly && sort <config-result >../actual.setup-ffonly &&
git remote set-branches --add scratch pu && git remote set-branches --add scratch seen &&
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.respect-ffonly sort <config-result >../actual.respect-ffonly
) && ) &&

Просмотреть файл

@ -747,42 +747,42 @@ test_expect_success 'deletion of a non-existent ref alone does trigger post-rece
' '
test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' ' test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
mk_test_with_hooks testrepo heads/master heads/next heads/pu && mk_test_with_hooks testrepo heads/master heads/next heads/seen &&
orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) && orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
newmaster=$(git show-ref -s --verify refs/heads/master) && newmaster=$(git show-ref -s --verify refs/heads/master) &&
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) && orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
newnext=$ZERO_OID && newnext=$ZERO_OID &&
orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) && orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
newpu=$(git show-ref -s --verify refs/heads/master) && newseen=$(git show-ref -s --verify refs/heads/master) &&
git push testrepo refs/heads/master:refs/heads/master \ git push testrepo refs/heads/master:refs/heads/master \
refs/heads/master:refs/heads/pu :refs/heads/next \ refs/heads/master:refs/heads/seen :refs/heads/next \
:refs/heads/nonexistent && :refs/heads/nonexistent &&
( (
cd testrepo/.git && cd testrepo/.git &&
cat >pre-receive.expect <<-EOF && cat >pre-receive.expect <<-EOF &&
$orgmaster $newmaster refs/heads/master $orgmaster $newmaster refs/heads/master
$orgnext $newnext refs/heads/next $orgnext $newnext refs/heads/next
$orgpu $newpu refs/heads/pu $orgseen $newseen refs/heads/seen
$ZERO_OID $ZERO_OID refs/heads/nonexistent $ZERO_OID $ZERO_OID refs/heads/nonexistent
EOF EOF
cat >update.expect <<-EOF && cat >update.expect <<-EOF &&
refs/heads/master $orgmaster $newmaster refs/heads/master $orgmaster $newmaster
refs/heads/next $orgnext $newnext refs/heads/next $orgnext $newnext
refs/heads/pu $orgpu $newpu refs/heads/seen $orgseen $newseen
refs/heads/nonexistent $ZERO_OID $ZERO_OID refs/heads/nonexistent $ZERO_OID $ZERO_OID
EOF EOF
cat >post-receive.expect <<-EOF && cat >post-receive.expect <<-EOF &&
$orgmaster $newmaster refs/heads/master $orgmaster $newmaster refs/heads/master
$orgnext $newnext refs/heads/next $orgnext $newnext refs/heads/next
$orgpu $newpu refs/heads/pu $orgseen $newseen refs/heads/seen
EOF EOF
cat >post-update.expect <<-EOF && cat >post-update.expect <<-EOF &&
refs/heads/master refs/heads/master
refs/heads/next refs/heads/next
refs/heads/pu refs/heads/seen
EOF EOF
test_cmp pre-receive.expect pre-receive.actual && test_cmp pre-receive.expect pre-receive.actual &&

Просмотреть файл

@ -494,7 +494,7 @@ test_expect_success '__gitcomp - prefix' '
' '
test_expect_success '__gitcomp - suffix' ' test_expect_success '__gitcomp - suffix' '
test_gitcomp "branch.me" "master maint next pu" "branch." \ test_gitcomp "branch.me" "master maint next seen" "branch." \
"ma" "." <<-\EOF "ma" "." <<-\EOF
branch.master.Z branch.master.Z
branch.maint.Z branch.maint.Z
@ -545,7 +545,7 @@ read -r -d "" refs <<-\EOF
maint maint
master master
next next
pu seen
EOF EOF
test_expect_success '__gitcomp_nl - trailing space' ' test_expect_success '__gitcomp_nl - trailing space' '