summaryrefslogtreecommitdiff
path: root/t/t5516-fetch-push.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-25 22:25:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-25 22:25:39 (GMT)
commit6c430a647cb990fc856d328733fa59e1fafadb97 (patch)
tree09bf6873a1b13f2f0178d864a09a30f9fe3cf09a /t/t5516-fetch-push.sh
parent48794acc50f14394ca6c4f5092a4a498f409f350 (diff)
parentd6edc189f6b3d8606150a52fd2c2fcd781b8550f (diff)
downloadgit-6c430a647cb990fc856d328733fa59e1fafadb97.zip
git-6c430a647cb990fc856d328733fa59e1fafadb97.tar.gz
git-6c430a647cb990fc856d328733fa59e1fafadb97.tar.bz2
Merge branch 'jx/proc-receive-hook'
"git receive-pack" that accepts requests by "git push" learned to outsource most of the ref updates to the new "proc-receive" hook. * jx/proc-receive-hook: doc: add documentation for the proc-receive hook transport: parse report options for tracking refs t5411: test updates of remote-tracking branches receive-pack: new config receive.procReceiveRefs doc: add document for capability report-status-v2 New capability "report-status-v2" for git-push receive-pack: feed report options to post-receive receive-pack: add new proc-receive hook t5411: add basic test cases for proc-receive hook transport: not report a non-head push as a branch
Diffstat (limited to 't/t5516-fetch-push.sh')
-rwxr-xr-xt/t5516-fetch-push.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 36ad20a..d11382f 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -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 &&
(