Skip to content

Commit 6dca5db

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 77dc604 commit 6dca5db

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

t/t5505-remote.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ test_expect_success 'remote set-branches' '
988988
+refs/heads/maint:refs/remotes/scratch/maint
989989
+refs/heads/master:refs/remotes/scratch/master
990990
+refs/heads/next:refs/remotes/scratch/next
991-
+refs/heads/pu:refs/remotes/scratch/pu
991+
+refs/heads/seen:refs/remotes/scratch/seen
992992
+refs/heads/t/topic:refs/remotes/scratch/t/topic
993993
EOF
994994
sort <<-\EOF >expect.setup-ffonly &&
@@ -998,7 +998,7 @@ test_expect_success 'remote set-branches' '
998998
sort <<-\EOF >expect.respect-ffonly &&
999999
refs/heads/master:refs/remotes/scratch/master
10001000
+refs/heads/next:refs/remotes/scratch/next
1001-
+refs/heads/pu:refs/remotes/scratch/pu
1001+
+refs/heads/seen:refs/remotes/scratch/seen
10021002
EOF
10031003
10041004
git clone .git/ setbranches &&
@@ -1016,7 +1016,7 @@ test_expect_success 'remote set-branches' '
10161016
git config --get-all remote.scratch.fetch >config-result &&
10171017
sort <config-result >../actual.replace &&
10181018
1019-
git remote set-branches --add scratch pu t/topic &&
1019+
git remote set-branches --add scratch seen t/topic &&
10201020
git config --get-all remote.scratch.fetch >config-result &&
10211021
sort <config-result >../actual.add-two &&
10221022
@@ -1028,7 +1028,7 @@ test_expect_success 'remote set-branches' '
10281028
git config --get-all remote.scratch.fetch >config-result &&
10291029
sort <config-result >../actual.setup-ffonly &&
10301030
1031-
git remote set-branches --add scratch pu &&
1031+
git remote set-branches --add scratch seen &&
10321032
git config --get-all remote.scratch.fetch >config-result &&
10331033
sort <config-result >../actual.respect-ffonly
10341034
) &&

t/t5516-fetch-push.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -747,42 +747,42 @@ test_expect_success 'deletion of a non-existent ref alone does trigger post-rece
747747
'
748748

749749
test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
750-
mk_test_with_hooks testrepo heads/master heads/next heads/pu &&
750+
mk_test_with_hooks testrepo heads/master heads/next heads/seen &&
751751
orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
752752
newmaster=$(git show-ref -s --verify refs/heads/master) &&
753753
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
754754
newnext=$ZERO_OID &&
755-
orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) &&
756-
newpu=$(git show-ref -s --verify refs/heads/master) &&
755+
orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
756+
newseen=$(git show-ref -s --verify refs/heads/master) &&
757757
git push testrepo refs/heads/master:refs/heads/master \
758-
refs/heads/master:refs/heads/pu :refs/heads/next \
758+
refs/heads/master:refs/heads/seen :refs/heads/next \
759759
:refs/heads/nonexistent &&
760760
(
761761
cd testrepo/.git &&
762762
cat >pre-receive.expect <<-EOF &&
763763
$orgmaster $newmaster refs/heads/master
764764
$orgnext $newnext refs/heads/next
765-
$orgpu $newpu refs/heads/pu
765+
$orgseen $newseen refs/heads/seen
766766
$ZERO_OID $ZERO_OID refs/heads/nonexistent
767767
EOF
768768
769769
cat >update.expect <<-EOF &&
770770
refs/heads/master $orgmaster $newmaster
771771
refs/heads/next $orgnext $newnext
772-
refs/heads/pu $orgpu $newpu
772+
refs/heads/seen $orgseen $newseen
773773
refs/heads/nonexistent $ZERO_OID $ZERO_OID
774774
EOF
775775
776776
cat >post-receive.expect <<-EOF &&
777777
$orgmaster $newmaster refs/heads/master
778778
$orgnext $newnext refs/heads/next
779-
$orgpu $newpu refs/heads/pu
779+
$orgseen $newseen refs/heads/seen
780780
EOF
781781
782782
cat >post-update.expect <<-EOF &&
783783
refs/heads/master
784784
refs/heads/next
785-
refs/heads/pu
785+
refs/heads/seen
786786
EOF
787787
788788
test_cmp pre-receive.expect pre-receive.actual &&

t/t9902-completion.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ test_expect_success '__gitcomp - prefix' '
494494
'
495495

496496
test_expect_success '__gitcomp - suffix' '
497-
test_gitcomp "branch.me" "master maint next pu" "branch." \
497+
test_gitcomp "branch.me" "master maint next seen" "branch." \
498498
"ma" "." <<-\EOF
499499
branch.master.Z
500500
branch.maint.Z
@@ -545,7 +545,7 @@ read -r -d "" refs <<-\EOF
545545
maint
546546
master
547547
next
548-
pu
548+
seen
549549
EOF
550550

551551
test_expect_success '__gitcomp_nl - trailing space' '

0 commit comments

Comments
 (0)