mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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:
parent
77dc6049c3
commit
6dca5dbf93
|
@ -988,7 +988,7 @@ test_expect_success 'remote set-branches' '
|
|||
+refs/heads/maint:refs/remotes/scratch/maint
|
||||
+refs/heads/master:refs/remotes/scratch/master
|
||||
+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
|
||||
EOF
|
||||
sort <<-\EOF >expect.setup-ffonly &&
|
||||
|
@ -998,7 +998,7 @@ test_expect_success 'remote set-branches' '
|
|||
sort <<-\EOF >expect.respect-ffonly &&
|
||||
refs/heads/master:refs/remotes/scratch/master
|
||||
+refs/heads/next:refs/remotes/scratch/next
|
||||
+refs/heads/pu:refs/remotes/scratch/pu
|
||||
+refs/heads/seen:refs/remotes/scratch/seen
|
||||
EOF
|
||||
|
||||
git clone .git/ setbranches &&
|
||||
|
@ -1016,7 +1016,7 @@ test_expect_success 'remote set-branches' '
|
|||
git config --get-all remote.scratch.fetch >config-result &&
|
||||
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 &&
|
||||
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 &&
|
||||
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 &&
|
||||
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' '
|
||||
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) &&
|
||||
newmaster=$(git show-ref -s --verify refs/heads/master) &&
|
||||
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
|
||||
newnext=$ZERO_OID &&
|
||||
orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) &&
|
||||
newpu=$(git show-ref -s --verify refs/heads/master) &&
|
||||
orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
|
||||
newseen=$(git show-ref -s --verify 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 &&
|
||||
(
|
||||
cd testrepo/.git &&
|
||||
cat >pre-receive.expect <<-EOF &&
|
||||
$orgmaster $newmaster refs/heads/master
|
||||
$orgnext $newnext refs/heads/next
|
||||
$orgpu $newpu refs/heads/pu
|
||||
$orgseen $newseen refs/heads/seen
|
||||
$ZERO_OID $ZERO_OID refs/heads/nonexistent
|
||||
EOF
|
||||
|
||||
cat >update.expect <<-EOF &&
|
||||
refs/heads/master $orgmaster $newmaster
|
||||
refs/heads/next $orgnext $newnext
|
||||
refs/heads/pu $orgpu $newpu
|
||||
refs/heads/seen $orgseen $newseen
|
||||
refs/heads/nonexistent $ZERO_OID $ZERO_OID
|
||||
EOF
|
||||
|
||||
cat >post-receive.expect <<-EOF &&
|
||||
$orgmaster $newmaster refs/heads/master
|
||||
$orgnext $newnext refs/heads/next
|
||||
$orgpu $newpu refs/heads/pu
|
||||
$orgseen $newseen refs/heads/seen
|
||||
EOF
|
||||
|
||||
cat >post-update.expect <<-EOF &&
|
||||
refs/heads/master
|
||||
refs/heads/next
|
||||
refs/heads/pu
|
||||
refs/heads/seen
|
||||
EOF
|
||||
|
||||
test_cmp pre-receive.expect pre-receive.actual &&
|
||||
|
|
|
@ -494,7 +494,7 @@ test_expect_success '__gitcomp - prefix' '
|
|||
'
|
||||
|
||||
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
|
||||
branch.master.Z
|
||||
branch.maint.Z
|
||||
|
@ -545,7 +545,7 @@ read -r -d "" refs <<-\EOF
|
|||
maint
|
||||
master
|
||||
next
|
||||
pu
|
||||
seen
|
||||
EOF
|
||||
|
||||
test_expect_success '__gitcomp_nl - trailing space' '
|
||||
|
|
Loading…
Reference in a new issue