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-0025-report-unknown-ref--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-0025-report-unknown-ref--porcelain.sh')
| -rw-r--r-- | t/t5411/test-0025-report-unknown-ref--porcelain.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh index d093b1a579..039e8b6163 100644 --- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh +++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh @@ -2,12 +2,12 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai 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 +# Refs of upstream : main(A) +# Refs of workbench: main(A) tags/v123 # git push : refs/for/a/b/c/my/topic test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" ' test_must_fail git -C workbench push --porcelain origin \ @@ -19,8 +19,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic remote: # proc-receive hook remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic - remote: proc-receive> ok refs/for/master/topic - remote: error: proc-receive reported status on unknown ref: refs/for/master/topic + remote: proc-receive> ok refs/for/main/topic + remote: error: proc-receive reported status on unknown ref: refs/for/main/topic To <URL/of/upstream.git> ! HEAD:refs/for/a/b/c/my/topic [remote rejected] (proc-receive failed to report status) Done @@ -29,7 +29,7 @@ test_expect_success "proc-receive: report unknown reference ($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 ' |