diff options
Diffstat (limited to 't/t5411/test-0026-push-options.sh')
| -rw-r--r-- | t/t5411/test-0026-push-options.sh | 96 |
1 files changed, 78 insertions, 18 deletions
diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh index d0c4da8b23..e88edb16a4 100644 --- a/t/t5411/test-0026-push-options.sh +++ b/t/t5411/test-0026-push-options.sh @@ -3,19 +3,19 @@ test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL write_script "$upstream/hooks/proc-receive" <<-EOF printf >&2 "# proc-receive hook\n" test-tool proc-receive -v \ - -r "ok refs/for/master/topic" + -r "ok refs/for/main/topic" EOF ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push -o ... : refs/for/master/topic +# 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)" ' test_must_fail git -C workbench push \ -o issue=123 \ -o reviewer=user1 \ origin \ - HEAD:refs/for/master/topic \ + 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" \ @@ -23,7 +23,7 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output <out >actual && cat >expect <<-EOF && - <COMMIT-A> refs/heads/master + <COMMIT-A> refs/heads/main EOF test_cmp expect actual ' @@ -32,9 +32,69 @@ test_expect_success "enable push options ($PROTOCOL)" ' git -C "$upstream" config receive.advertisePushOptions true ' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push -o ... : next(A) refs/for/master/topic +test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL)" ' + write_script "$upstream/hooks/proc-receive" <<-EOF + printf >&2 "# proc-receive hook\n" + test-tool proc-receive -v \ + --version 0 \ + -r "ok refs/for/main/topic" + EOF +' + +# 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: ignore push-options for version 0 ($PROTOCOL)" ' + git -C workbench push \ + --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< <ZERO-OID> <COMMIT-A> refs/for/main/topic + 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> + * [new branch] HEAD -> next + * [new reference] HEAD -> refs/for/main/topic + 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 +' + +test_expect_success "restore proc-receive hook ($PROTOCOL)" ' + 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) next(A) +# Refs of workbench: main(A) tags/v123 +test_expect_success "cleanup ($PROTOCOL)" ' + git -C "$upstream" update-ref -d refs/heads/next +' + +# 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)" ' git -C workbench push \ --atomic \ @@ -42,38 +102,38 @@ test_expect_success "proc-receive: push with options ($PROTOCOL)" ' -o reviewer=user1 \ origin \ HEAD:refs/heads/next \ - HEAD:refs/for/master/topic \ + 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/master/topic + 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/master/topic + 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/master/topic + 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/master/topic + remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic To <URL/of/upstream.git> * [new branch] HEAD -> next - * [new reference] HEAD -> refs/for/master/topic + * [new reference] HEAD -> refs/for/main/topic 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/master + <COMMIT-A> refs/heads/main <COMMIT-A> refs/heads/next EOF test_cmp expect actual ' -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 +# Refs of upstream : main(A) next(A) +# Refs of workbench: main(A) tags/v123 test_expect_success "cleanup ($PROTOCOL)" ' git -C "$upstream" update-ref -d refs/heads/next ' |