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>
Johannes Schindelin committed
Jun 25, 2020 at 12:18 UTC
6dca5dbf93ab8cfb82e626766d5e0e60a3da555d
3 files changed
+14
-14
t/t5505-remote.sh
+4
-4
@@ -988,7 +988,7 @@ test_expect_success 'remote set-branches' '
988
+refs/heads/maint:refs/remotes/scratch/maint
989
+refs/heads/master:refs/remotes/scratch/master
990
+refs/heads/next:refs/remotes/scratch/next
991
- +refs/heads/pu:refs/remotes/scratch/pu
991
+ +refs/heads/seen:refs/remotes/scratch/seen
992
+refs/heads/t/topic:refs/remotes/scratch/t/topic
993
EOF
994
sort <<-\EOF >expect.setup-ffonly &&
@@ -998,7 +998,7 @@ test_expect_success 'remote set-branches' '
998
sort <<-\EOF >expect.respect-ffonly &&
999
refs/heads/master:refs/remotes/scratch/master
1000
+refs/heads/next:refs/remotes/scratch/next
1001
- +refs/heads/pu:refs/remotes/scratch/pu
1001
+ +refs/heads/seen:refs/remotes/scratch/seen
1002
EOF
1003
1004
git clone .git/ setbranches &&
@@ -1016,7 +1016,7 @@ test_expect_success 'remote set-branches' '
1016
git config --get-all remote.scratch.fetch >config-result &&
1017
sort <config-result >../actual.replace &&
1018
1019
- git remote set-branches --add scratch pu t/topic &&
1019
+ git remote set-branches --add scratch seen t/topic &&
1020
git config --get-all remote.scratch.fetch >config-result &&
1021
sort <config-result >../actual.add-two &&
1022
@@ -1028,7 +1028,7 @@ test_expect_success 'remote set-branches' '
1028
git config --get-all remote.scratch.fetch >config-result &&
1029
sort <config-result >../actual.setup-ffonly &&
1030
1031
- git remote set-branches --add scratch pu &&
1031
+ git remote set-branches --add scratch seen &&
1032
git config --get-all remote.scratch.fetch >config-result &&
1033
sort <config-result >../actual.respect-ffonly
1034
) &&
t/t5516-fetch-push.sh
+8
-8
@@ -747,42 +747,42 @@ test_expect_success 'deletion of a non-existent ref alone does trigger post-rece
747
'
748
749
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 &&
751
orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
752
newmaster=$(git show-ref -s --verify refs/heads/master) &&
753
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
754
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) &&
757
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 \
759
:refs/heads/nonexistent &&
760
(
761
cd testrepo/.git &&
762
cat >pre-receive.expect <<-EOF &&
763
$orgmaster $newmaster refs/heads/master
764
$orgnext $newnext refs/heads/next
765
- $orgpu $newpu refs/heads/pu
765
+ $orgseen $newseen refs/heads/seen
766
$ZERO_OID $ZERO_OID refs/heads/nonexistent
767
EOF
768
769
cat >update.expect <<-EOF &&
770
refs/heads/master $orgmaster $newmaster
771
refs/heads/next $orgnext $newnext
772
- refs/heads/pu $orgpu $newpu
772
+ refs/heads/seen $orgseen $newseen
773
refs/heads/nonexistent $ZERO_OID $ZERO_OID
774
EOF
775
776
cat >post-receive.expect <<-EOF &&
777
$orgmaster $newmaster refs/heads/master
778
$orgnext $newnext refs/heads/next
779
- $orgpu $newpu refs/heads/pu
779
+ $orgseen $newseen refs/heads/seen
780
EOF
781
782
cat >post-update.expect <<-EOF &&
783
refs/heads/master
784
refs/heads/next
785
- refs/heads/pu
785
+ refs/heads/seen
786
EOF
787
788
test_cmp pre-receive.expect pre-receive.actual &&
t/t9902-completion.sh
+2
-2
@@ -494,7 +494,7 @@ test_expect_success '__gitcomp - prefix' '
494
'
495
496
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." \
498
"ma" "." <<-\EOF
499
branch.master.Z
500
branch.maint.Z
@@ -545,7 +545,7 @@ read -r -d "" refs <<-\EOF
545
maint
546
master
547
next
548
-pu
548
+seen
549
EOF
550
551
test_expect_success '__gitcomp_nl - trailing space' '