a9568dba41
This trick was performed via $ sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t/t5411/* In the previous commit, we adjusted roughly half of the support files, to stay under the 100kB limit (mails larger than that are rejected by the Git mailing list). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
83 lines
2.6 KiB
Bash
83 lines
2.6 KiB
Bash
test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL/porcelain)" '
|
|
git -C "$upstream" config receive.advertisePushOptions false &&
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push -o ... : refs/for/main/topic
|
|
test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain)" '
|
|
test_must_fail git -C workbench push \
|
|
--porcelain \
|
|
-o issue=123 \
|
|
-o reviewer=user1 \
|
|
origin \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
test_i18ngrep "fatal: the receiving end does not support push options" \
|
|
actual &&
|
|
git -C "$upstream" show-ref >out &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
<COMMIT-A> refs/heads/main
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "enable push options ($PROTOCOL/porcelain)" '
|
|
git -C "$upstream" config receive.advertisePushOptions true
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push -o ... : next(A) refs/for/main/topic
|
|
test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" '
|
|
git -C workbench push \
|
|
--porcelain \
|
|
--atomic \
|
|
-o issue=123 \
|
|
-o reviewer=user1 \
|
|
origin \
|
|
HEAD:refs/heads/next \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
remote: # pre-receive hook
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive: atomic push_options
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive< issue=123
|
|
remote: proc-receive< reviewer=user1
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: # post-receive hook
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
To <URL/of/upstream.git>
|
|
* HEAD:refs/heads/next [new branch]
|
|
* HEAD:refs/for/main/topic [new reference]
|
|
Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git -C "$upstream" show-ref >out &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
<COMMIT-A> refs/heads/main
|
|
<COMMIT-A> refs/heads/next
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Refs of upstream : main(A) next(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL/porcelain)" '
|
|
git -C "$upstream" update-ref -d refs/heads/next
|
|
'
|