diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-31 20:46:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-31 21:15:17 +0100 |
| commit | a9568dba4177bfe6b75e12a13acd150195e848e0 (patch) | |
| tree | 518ee6812e8c8672a3f0b2408b916b9e5b118bbd /t/t5411/test-0027-push-options--porcelain.sh | |
| parent | t5411: start adjusting the support files for init.defaultBranch=main (diff) | |
| download | git-a9568dba4177bfe6b75e12a13acd150195e848e0.tar.xz git-a9568dba4177bfe6b75e12a13acd150195e848e0.zip | |
t5411: adjust the remaining support files for init.defaultBranch=main
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>
Diffstat (limited to 't/t5411/test-0027-push-options--porcelain.sh')
| -rw-r--r-- | t/t5411/test-0027-push-options--porcelain.sh | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh index c89a1e7c57..d5d0dcb172 100644 --- a/t/t5411/test-0027-push-options--porcelain.sh +++ b/t/t5411/test-0027-push-options--porcelain.sh @@ -3,20 +3,20 @@ 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/porcelain)" ' test_must_fail git -C workbench push \ --porcelain \ -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" \ @@ -24,7 +24,7 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain 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 ' @@ -33,9 +33,9 @@ test_expect_success "enable push options ($PROTOCOL/porcelain)" ' 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 +# 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 \ @@ -44,39 +44,39 @@ test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" ' -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> * HEAD:refs/heads/next [new branch] - * HEAD:refs/for/master/topic [new reference] + * 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/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/porcelain)" ' git -C "$upstream" update-ref -d refs/heads/next ' |