Merge branch 'jx/proc-receive-hook'

[thirdparty/git.git] / t / t5516-fetch-push.sh

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 9c6218f568ea3bc4c61a1377fc4b2be150b4be1d..d11382f769f6669aa1f95e83a45fd266d4b9e304 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -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 &&
@@ -1039,7 +1039,7 @@ test_force_fetch_tag "annotated tag" "-f -a -m'tag message'"
 test_expect_success 'push --porcelain' '
        mk_empty testrepo &&
        echo >.git/foo  "To testrepo" &&
-       echo >>.git/foo "*      refs/heads/master:refs/remotes/origin/master    [new branch]"  &&
+       echo >>.git/foo "*      refs/heads/master:refs/remotes/origin/master    [new reference]"  &&
        echo >>.git/foo "Done" &&
        git push >.git/bar --porcelain  testrepo refs/heads/master:refs/remotes/origin/master &&
        (