diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-07-07 08:09:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-07-07 08:09:16 +0300 |
commit | 8a78e4d61588fe8e46dd7d27cb2d521b07f4a191 (patch) | |
tree | d986f3b24c2037e3fdbf999e558ce74030922bc7 /t/t5516-fetch-push.sh | |
parent | 0258ed1e08e7973f1d6829db8d33109851067a91 (diff) | |
parent | 6dca5dbf93ab8cfb82e626766d5e0e60a3da555d (diff) |
Merge branch 'js/pu-to-seen'
The documentation and some tests have been adjusted for the recent
renaming of "pu" branch to "seen".
* js/pu-to-seen:
tests: reference `seen` wherever `pu` was referenced
docs: adjust the technical overview for the rename `pu` -> `seen`
docs: adjust for the recent rename of `pu` to `seen`
Diffstat (limited to 't/t5516-fetch-push.sh')
-rwxr-xr-x | t/t5516-fetch-push.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 9c6218f568..36ad20a849 100755 --- 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 && |