mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5411: adjust the remaining support files for init.defaultBranch=main

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2020-10-31 19:46:02 +00:00 committed by Junio C Hamano
parent 8f0a264524
commit a9568dba41
18 changed files with 355 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t5411/common-functions.sh
View File

@ -28,7 +28,7 @@ create_commits_in () {
shift || shift ||
return 1 return 1
done && done &&
git -C "$repo" update-ref refs/heads/master $oid git -C "$repo" update-ref refs/heads/main $oid
} }
# Format the output of git-push, git-show-ref and other commands to make a # Format the output of git-push, git-show-ref and other commands to make a

50
t/t5411/once-0010-report-status-v1.sh
View File

@ -6,12 +6,12 @@ test_expect_success "setup proc-receive hook" '
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/for/master/topic1" \ -r "ok refs/for/main/topic1" \
-r "option fall-through" \ -r "option fall-through" \
-r "ok refs/for/master/topic2" \ -r "ok refs/for/main/topic2" \
-r "option refname refs/for/changes/23/123/1" \ -r "option refname refs/for/changes/23/123/1" \
-r "option new-oid $A" \ -r "option new-oid $A" \
-r "ok refs/for/master/topic2" \ -r "ok refs/for/main/topic2" \
-r "option refname refs/for/changes/24/124/2" \ -r "option refname refs/for/changes/24/124/2" \
-r "option old-oid $B" \ -r "option old-oid $B" \
-r "option new-oid $A" \ -r "option new-oid $A" \
@ -20,26 +20,26 @@ test_expect_success "setup proc-receive hook" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : (B) refs/for/master/topic1(A) foo(A) refs/for/next/topic(A) refs/for/master/topic2(A) # git push : (B) refs/for/main/topic1(A) foo(A) refs/for/next/topic(A) refs/for/main/topic2(A)
test_expect_success "proc-receive: report status v1" ' test_expect_success "proc-receive: report status v1" '
{ {
if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1" if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"
then then
printf "%s %s refs/heads/master\0report-status\n" \ printf "%s %s refs/heads/main\0report-status\n" \
$A $B | packetize $A $B | packetize
else else
printf "%s %s refs/heads/master\0report-status object-format=$GIT_DEFAULT_HASH\n" \ printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
$A $B | packetize $A $B | packetize
fi && fi &&
printf "%s %s refs/for/master/topic1\n" \ printf "%s %s refs/for/main/topic1\n" \
$ZERO_OID $A | packetize && $ZERO_OID $A | packetize &&
printf "%s %s refs/heads/foo\n" \ printf "%s %s refs/heads/foo\n" \
$ZERO_OID $A | packetize && $ZERO_OID $A | packetize &&
printf "%s %s refs/for/next/topic\n" \ printf "%s %s refs/for/next/topic\n" \
$ZERO_OID $A | packetize && $ZERO_OID $A | packetize &&
printf "%s %s refs/for/master/topic2\n" \ printf "%s %s refs/for/main/topic2\n" \
$ZERO_OID $A | packetize && $ZERO_OID $A | packetize &&
printf 0000 && printf 0000 &&
printf "" | git -C "$upstream" pack-objects --stdout printf "" | git -C "$upstream" pack-objects --stdout
@ -48,35 +48,35 @@ test_expect_success "proc-receive: report status v1" '
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
# pre-receive hook # pre-receive hook
pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1 pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2 pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
# proc-receive hook # proc-receive hook
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1 proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic2 proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
proc-receive> ok refs/for/master/topic1 proc-receive> ok refs/for/main/topic1
proc-receive> option fall-through proc-receive> option fall-through
proc-receive> ok refs/for/master/topic2 proc-receive> ok refs/for/main/topic2
proc-receive> option refname refs/for/changes/23/123/1 proc-receive> option refname refs/for/changes/23/123/1
proc-receive> option new-oid <COMMIT-A> proc-receive> option new-oid <COMMIT-A>
proc-receive> ok refs/for/master/topic2 proc-receive> ok refs/for/main/topic2
proc-receive> option refname refs/for/changes/24/124/2 proc-receive> option refname refs/for/changes/24/124/2
proc-receive> option old-oid <COMMIT-B> proc-receive> option old-oid <COMMIT-B>
proc-receive> option new-oid <COMMIT-A> proc-receive> option new-oid <COMMIT-A>
proc-receive> option forced-update proc-receive> option forced-update
proc-receive> ng refs/for/next/topic target branch not exist proc-receive> ng refs/for/next/topic target branch not exist
000eunpack ok 000eunpack ok
0019ok refs/heads/master 0019ok refs/heads/main
001eok refs/for/master/topic1 001eok refs/for/main/topic1
0016ok refs/heads/foo 0016ok refs/heads/foo
0033ng refs/for/next/topic target branch not exist 0033ng refs/for/next/topic target branch not exist
001eok refs/for/master/topic2 001eok refs/for/main/topic2
0000# post-receive hook 0000# post-receive hook
post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
post-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic1 post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1 post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1
post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2 post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2
@ -86,9 +86,9 @@ test_expect_success "proc-receive: report status v1" '
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/for/master/topic1 <COMMIT-A> refs/for/main/topic1
<COMMIT-A> refs/heads/foo <COMMIT-A> refs/heads/foo
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

72
t/t5411/test-0000-standard-git-push.sh
View File

@ -1,39 +1,39 @@
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push : master(B) next(A) # git-push : main(B) next(A)
test_expect_success "git-push ($PROTOCOL)" ' test_expect_success "git-push ($PROTOCOL)" '
git -C workbench push origin \ git -C workbench push origin \
$B:refs/heads/master \ $B:refs/heads/main \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
<OID-A>..<OID-B> <COMMIT-B> -> master <OID-A>..<OID-B> <COMMIT-B> -> main
* [new branch] HEAD -> next * [new branch] HEAD -> next
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) next(A) # Refs of upstream : main(B) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push --atomic: master(A) next(B) # git-push --atomic: main(A) next(B)
test_expect_success "git-push --atomic ($PROTOCOL)" ' test_expect_success "git-push --atomic ($PROTOCOL)" '
test_must_fail git -C workbench push --atomic origin \ test_must_fail git -C workbench push --atomic origin \
master \ main \
$B:refs/heads/next \ $B:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out | make_user_friendly_and_stable_output <out |
@ -43,28 +43,28 @@ test_expect_success "git-push --atomic ($PROTOCOL)" '
>actual && >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [rejected] master -> master (non-fast-forward) ! [rejected] main -> main (non-fast-forward)
! [rejected] <COMMIT-B> -> next (atomic push failed) ! [rejected] <COMMIT-B> -> next (atomic push failed)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) next(A) # Refs of upstream : main(B) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push : master(A) next(B) # git-push : main(A) next(B)
test_expect_success "non-fast-forward git-push ($PROTOCOL)" ' test_expect_success "non-fast-forward git-push ($PROTOCOL)" '
test_must_fail git \ test_must_fail git \
-C workbench \ -C workbench \
-c advice.pushUpdateRejected=false \ -c advice.pushUpdateRejected=false \
push origin \ push origin \
master \ main \
$B:refs/heads/next \ $B:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
@ -75,48 +75,48 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL)" '
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
<OID-A>..<OID-B> <COMMIT-B> -> next <OID-A>..<OID-B> <COMMIT-B> -> next
! [rejected] master -> master (non-fast-forward) ! [rejected] main -> main (non-fast-forward)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
<COMMIT-B> refs/heads/next <COMMIT-B> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) next(B) # Refs of upstream : main(B) next(B)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) # git-push -f : main(A) NULL tags/v123 refs/review/main/topic(A) a/b/c(A)
test_expect_success "git-push -f ($PROTOCOL)" ' test_expect_success "git-push -f ($PROTOCOL)" '
git -C workbench push -f origin \ git -C workbench push -f origin \
refs/tags/v123 \ refs/tags/v123 \
:refs/heads/next \ :refs/heads/next \
master \ main \
master:refs/review/master/topic \ main:refs/review/main/topic \
HEAD:refs/heads/a/b/c \ HEAD:refs/heads/a/b/c \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main
remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next
remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main
remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next
remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
To <URL/of/upstream.git> To <URL/of/upstream.git>
+ <OID-B>...<OID-A> master -> master (forced update) + <OID-B>...<OID-A> main -> main (forced update)
- [deleted] next - [deleted] next
* [new tag] v123 -> v123 * [new tag] v123 -> v123
* [new reference] master -> refs/review/master/topic * [new reference] main -> refs/review/main/topic
* [new branch] HEAD -> a/b/c * [new branch] HEAD -> a/b/c
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
@ -124,19 +124,19 @@ test_expect_success "git-push -f ($PROTOCOL)" '
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/a/b/c <COMMIT-A> refs/heads/a/b/c
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/review/master/topic <COMMIT-A> refs/review/main/topic
<TAG-v123> refs/tags/v123 <TAG-v123> refs/tags/v123
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) # Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL)" ' test_expect_success "cleanup ($PROTOCOL)" '
( (
cd "$upstream" && cd "$upstream" &&
git update-ref -d refs/review/master/topic && git update-ref -d refs/review/main/topic &&
git update-ref -d refs/tags/v123 && git update-ref -d refs/tags/v123 &&
git update-ref -d refs/heads/a/b/c git update-ref -d refs/heads/a/b/c
) )

72
t/t5411/test-0001-standard-git-push--porcelain.sh
View File

@ -1,21 +1,21 @@
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push : master(B) next(A) # git-push : main(B) next(A)
test_expect_success "git-push ($PROTOCOL/porcelain)" ' test_expect_success "git-push ($PROTOCOL/porcelain)" '
git -C workbench push --porcelain origin \ git -C workbench push --porcelain origin \
$B:refs/heads/master \ $B:refs/heads/main \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
<COMMIT-B>:refs/heads/master <OID-A>..<OID-B> <COMMIT-B>:refs/heads/main <OID-A>..<OID-B>
* HEAD:refs/heads/next [new branch] * HEAD:refs/heads/next [new branch]
Done Done
EOF EOF
@ -23,18 +23,18 @@ test_expect_success "git-push ($PROTOCOL/porcelain)" '
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) next(A) # Refs of upstream : main(B) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push --atomic: master(A) next(B) # git-push --atomic: main(A) next(B)
test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" ' test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --atomic --porcelain origin \ test_must_fail git -C workbench push --atomic --porcelain origin \
master \ main \
$B:refs/heads/next \ $B:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out | make_user_friendly_and_stable_output <out |
@ -45,28 +45,28 @@ test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" '
>actual && >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
To <URL/of/upstream.git> To <URL/of/upstream.git>
! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
! <COMMIT-B>:refs/heads/next [rejected] (atomic push failed) ! <COMMIT-B>:refs/heads/next [rejected] (atomic push failed)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) next(A) # Refs of upstream : main(B) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push : master(A) next(B) # git-push : main(A) next(B)
test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" '
test_must_fail git \ test_must_fail git \
-C workbench \ -C workbench \
-c advice.pushUpdateRejected=false \ -c advice.pushUpdateRejected=false \
push --porcelain origin \ push --porcelain origin \
master \ main \
$B:refs/heads/next \ $B:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
@ -77,49 +77,49 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" '
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
<COMMIT-B>:refs/heads/next <OID-A>..<OID-B> <COMMIT-B>:refs/heads/next <OID-A>..<OID-B>
! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
<COMMIT-B> refs/heads/next <COMMIT-B> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) next(B) # Refs of upstream : main(B) next(B)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) # git-push -f : main(A) NULL tags/v123 refs/review/main/topic(A) a/b/c(A)
test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' test_expect_success "git-push -f ($PROTOCOL/porcelain)" '
git -C workbench push --porcelain -f origin \ git -C workbench push --porcelain -f origin \
refs/tags/v123 \ refs/tags/v123 \
:refs/heads/next \ :refs/heads/next \
master \ main \
master:refs/review/master/topic \ main:refs/review/main/topic \
HEAD:refs/heads/a/b/c \ HEAD:refs/heads/a/b/c \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main
remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next
remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main
remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next
remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123 remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
To <URL/of/upstream.git> To <URL/of/upstream.git>
+ refs/heads/master:refs/heads/master <OID-B>...<OID-A> (forced update) + refs/heads/main:refs/heads/main <OID-B>...<OID-A> (forced update)
- :refs/heads/next [deleted] - :refs/heads/next [deleted]
* refs/tags/v123:refs/tags/v123 [new tag] * refs/tags/v123:refs/tags/v123 [new tag]
* refs/heads/master:refs/review/master/topic [new reference] * refs/heads/main:refs/review/main/topic [new reference]
* HEAD:refs/heads/a/b/c [new branch] * HEAD:refs/heads/a/b/c [new branch]
Done Done
EOF EOF
@ -128,19 +128,19 @@ test_expect_success "git-push -f ($PROTOCOL/porcelain)" '
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/a/b/c <COMMIT-A> refs/heads/a/b/c
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/review/master/topic <COMMIT-A> refs/review/main/topic
<TAG-v123> refs/tags/v123 <TAG-v123> refs/tags/v123
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) # Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL/porcelain)" ' test_expect_success "cleanup ($PROTOCOL/porcelain)" '
( (
cd "$upstream" && cd "$upstream" &&
git update-ref -d refs/review/master/topic && git update-ref -d refs/review/main/topic &&
git update-ref -d refs/tags/v123 && git update-ref -d refs/tags/v123 &&
git update-ref -d refs/heads/a/b/c git update-ref -d refs/heads/a/b/c
) )

12
t/t5411/test-0002-pre-receive-declined.sh
View File

@ -5,25 +5,25 @@ test_expect_success "setup pre-receive hook ($PROTOCOL)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push : master(B) next(A) # git-push : main(B) next(A)
test_expect_success "git-push is declined ($PROTOCOL)" ' test_expect_success "git-push is declined ($PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
$B:refs/heads/master \ $B:refs/heads/main \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] <COMMIT-B> -> master (pre-receive hook declined) ! [remote rejected] <COMMIT-B> -> main (pre-receive hook declined)
! [remote rejected] HEAD -> next (pre-receive hook declined) ! [remote rejected] HEAD -> next (pre-receive hook declined)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

12
t/t5411/test-0003-pre-receive-declined--porcelain.sh
View File

@ -5,18 +5,18 @@ test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git-push : master(B) next(A) # git-push : main(B) next(A)
test_expect_success "git-push is declined ($PROTOCOL/porcelain)" ' test_expect_success "git-push is declined ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
$B:refs/heads/master \ $B:refs/heads/main \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
To <URL/of/upstream.git> To <URL/of/upstream.git>
! <COMMIT-B>:refs/heads/master [remote rejected] (pre-receive hook declined) ! <COMMIT-B>:refs/heads/main [remote rejected] (pre-receive hook declined)
! HEAD:refs/heads/next [remote rejected] (pre-receive hook declined) ! HEAD:refs/heads/next [remote rejected] (pre-receive hook declined)
Done Done
EOF EOF
@ -24,7 +24,7 @@ test_expect_success "git-push is declined ($PROTOCOL/porcelain)" '
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

38
t/t5411/test-0011-no-hook-error.sh
View File

@ -1,64 +1,64 @@
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : next(A) refs/for/master/topic(A) # git push : next(A) refs/for/main/topic(A)
test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL)" ' test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:next \ HEAD:next \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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: error: cannot find hook "proc-receive" remote: error: cannot find hook "proc-receive"
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
* [new branch] HEAD -> next * [new branch] HEAD -> next
! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) next(A) # Refs of upstream : main(A) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL)" ' test_expect_success "cleanup ($PROTOCOL)" '
git -C "$upstream" update-ref -d refs/heads/next git -C "$upstream" update-ref -d refs/heads/next
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push --atomic: (B) next(A) refs/for/master/topic(A) # git push --atomic: (B) next(A) refs/for/main/topic(A)
test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL)" ' test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL)" '
test_must_fail git -C workbench push --atomic origin \ test_must_fail git -C workbench push --atomic origin \
$B:master \ $B:main \
HEAD:next \ HEAD:next \
HEAD:refs/for/master/topic >out 2>&1 && HEAD:refs/for/main/topic >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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: error: cannot find hook "proc-receive" remote: error: cannot find hook "proc-receive"
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] <COMMIT-B> -> master (fail to run proc-receive hook) ! [remote rejected] <COMMIT-B> -> main (fail to run proc-receive hook)
! [remote rejected] HEAD -> next (fail to run proc-receive hook) ! [remote rejected] HEAD -> next (fail to run proc-receive hook)
! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

38
t/t5411/test-0012-no-hook-error--porcelain.sh
View File

@ -1,66 +1,66 @@
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : next(A) refs/for/master/topic(A) # git push : next(A) refs/for/main/topic(A)
test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/porcelain)" ' test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:next \ HEAD:next \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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: error: cannot find hook "proc-receive" remote: error: cannot find hook "proc-receive"
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
* HEAD:refs/heads/next [new branch] * HEAD:refs/heads/next [new branch]
! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) next(A) # Refs of upstream : main(A) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL/porcelain)" ' test_expect_success "cleanup ($PROTOCOL/porcelain)" '
git -C "$upstream" update-ref -d refs/heads/next git -C "$upstream" update-ref -d refs/heads/next
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push --atomic: (B) next(A) refs/for/master/topic(A) # git push --atomic: (B) next(A) refs/for/main/topic(A)
test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL/porcelain)" ' test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain --atomic origin \ test_must_fail git -C workbench push --porcelain --atomic origin \
$B:master \ $B:main \
HEAD:next \ HEAD:next \
HEAD:refs/for/master/topic >out 2>&1 && HEAD:refs/for/main/topic >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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: error: cannot find hook "proc-receive" remote: error: cannot find hook "proc-receive"
To <URL/of/upstream.git> To <URL/of/upstream.git>
! <COMMIT-B>:refs/heads/master [remote rejected] (fail to run proc-receive hook) ! <COMMIT-B>:refs/heads/main [remote rejected] (fail to run proc-receive hook)
! HEAD:refs/heads/next [remote rejected] (fail to run proc-receive hook) ! HEAD:refs/heads/next [remote rejected] (fail to run proc-receive hook)
! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

96
t/t5411/test-0013-bad-protocol.sh
View File

@ -5,12 +5,12 @@ test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic(A) # git push : refs/for/main/topic(A)
test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
@ -20,7 +20,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
<actual >actual-report && <actual >actual-report &&
cat >expect <<-EOF && cat >expect <<-EOF &&
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
EOF EOF
test_cmp expect actual-report && test_cmp expect actual-report &&
@ -36,7 +36,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -48,30 +48,30 @@ test_expect_success "setup proc-receive hook (hook --die-version, $PROTOCOL)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic(A) # git push : refs/for/main/topic(A)
test_expect_success "proc-receive: bad protocol (hook --die-version, $PROTOCOL)" ' test_expect_success "proc-receive: bad protocol (hook --die-version, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
remote: fatal: bad protocol version: 1 remote: fatal: bad protocol version: 1
remote: error: proc-receive version "0" is not supported remote: error: proc-receive version "0" is not supported
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/master/topic (fail to run proc-receive hook) ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -83,21 +83,21 @@ test_expect_success "setup proc-receive hook (hook --die-readline, $PROTOCOL)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic(A) # git push : refs/for/main/topic(A)
test_expect_success "proc-receive: bad protocol (hook --die-readline, $PROTOCOL)" ' test_expect_success "proc-receive: bad protocol (hook --die-readline, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
grep "remote: fatal: protocol error: expected \"old new ref\", got \"<ZERO-OID> <COMMIT-A> refs/for/master/topic\"" actual && grep "remote: fatal: protocol error: expected \"old new ref\", got \"<ZERO-OID> <COMMIT-A> refs/for/main/topic\"" actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -109,38 +109,38 @@ test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : next(A) refs/for/master/topic(A) # git push : next(A) refs/for/main/topic(A)
test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" ' test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
HEAD:refs/for/master/topic >out 2>&1 && HEAD:refs/for/main/topic >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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 hook
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
* [new branch] HEAD -> next * [new branch] HEAD -> next
! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) next(A) # Refs of upstream : main(A) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL)" ' test_expect_success "cleanup ($PROTOCOL)" '
git -C "$upstream" update-ref -d refs/heads/next git -C "$upstream" update-ref -d refs/heads/next
@ -154,29 +154,29 @@ test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" ' test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic\ HEAD:refs/for/main/topic\
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> ok remote: proc-receive> ok
remote: error: proc-receive reported incomplete status line: "ok" remote: error: proc-receive reported incomplete status line: "ok"
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -185,33 +185,33 @@ test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" '
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "xx refs/for/master/topic" -r "xx refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" ' test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> xx refs/for/master/topic remote: proc-receive> xx refs/for/main/topic
remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

70
t/t5411/test-0014-bad-protocol--porcelain.sh
View File

@ -5,12 +5,12 @@ test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcela
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic(A) # git push : refs/for/main/topic(A)
test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porcelain)" ' test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
@ -20,7 +20,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc
<actual >actual-report && <actual >actual-report &&
cat >expect <<-EOF && cat >expect <<-EOF &&
To <URL/of/upstream.git> To <URL/of/upstream.git>
! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
Done Done
EOF EOF
test_cmp expect actual-report && test_cmp expect actual-report &&
@ -37,7 +37,7 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -49,39 +49,39 @@ test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : next(A) refs/for/master/topic(A) # git push : next(A) refs/for/main/topic(A)
test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" ' test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
HEAD:refs/for/master/topic >out 2>&1 && HEAD:refs/for/main/topic >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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 hook
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
To <URL/of/upstream.git> To <URL/of/upstream.git>
* HEAD:refs/heads/next [new branch] * HEAD:refs/heads/next [new branch]
! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) next(A) # Refs of upstream : main(A) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL/porcelain)" ' test_expect_success "cleanup ($PROTOCOL/porcelain)" '
git -C "$upstream" update-ref -d refs/heads/next git -C "$upstream" update-ref -d refs/heads/next
@ -95,30 +95,30 @@ test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" ' test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:refs/for/master/topic\ HEAD:refs/for/main/topic\
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> ok remote: proc-receive> ok
remote: error: proc-receive reported incomplete status line: "ok" remote: error: proc-receive reported incomplete status line: "ok"
To <URL/of/upstream.git> To <URL/of/upstream.git>
! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -127,34 +127,34 @@ test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelai
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "xx refs/for/master/topic" -r "xx refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" ' test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> xx refs/for/master/topic remote: proc-receive> xx refs/for/main/topic
remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"
To <URL/of/upstream.git> To <URL/of/upstream.git>
! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

40
t/t5411/test-0020-report-ng.sh
View File

@ -2,32 +2,32 @@ test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" '
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ng refs/for/master/topic" -r "ng refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" ' test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> ng refs/for/master/topic remote: proc-receive> ng refs/for/main/topic
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/master/topic (failed) ! [remote rejected] HEAD -> refs/for/main/topic (failed)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -36,32 +36,32 @@ test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" '
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ng refs/for/master/topic error msg" -r "ng refs/for/main/topic error msg"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" ' test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> ng refs/for/master/topic error msg remote: proc-receive> ng refs/for/main/topic error msg
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/master/topic (error msg) ! [remote rejected] HEAD -> refs/for/main/topic (error msg)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

40
t/t5411/test-0021-report-ng--porcelain.sh
View File

@ -2,33 +2,33 @@ test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelai
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ng refs/for/master/topic" -r "ng refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/porcelain)" ' test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> ng refs/for/master/topic remote: proc-receive> ng refs/for/main/topic
To <URL/of/upstream.git> To <URL/of/upstream.git>
! HEAD:refs/for/master/topic [remote rejected] (failed) ! HEAD:refs/for/main/topic [remote rejected] (failed)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -37,33 +37,33 @@ test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)"
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ng refs/for/master/topic error msg" -r "ng refs/for/main/topic error msg"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/master/topic # git push : refs/for/main/topic
test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/porcelain)" ' test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
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 hook
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> ng refs/for/master/topic error msg remote: proc-receive> ng refs/for/main/topic error msg
To <URL/of/upstream.git> To <URL/of/upstream.git>
! HEAD:refs/for/master/topic [remote rejected] (error msg) ! HEAD:refs/for/main/topic [remote rejected] (error msg)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

36
t/t5411/test-0022-report-unexpect-ref.sh
View File

@ -2,44 +2,44 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/heads/master" -r "ok refs/heads/main"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : (B) refs/for/master/topic # git push : (B) refs/for/main/topic
test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" ' test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
$B:refs/heads/master \ $B:refs/heads/main \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
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 hook
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> ok refs/heads/master remote: proc-receive> ok refs/heads/main
remote: error: proc-receive reported status on unexpected ref: refs/heads/master remote: error: proc-receive reported status on unexpected ref: refs/heads/main
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
To <URL/of/upstream.git> To <URL/of/upstream.git>
<OID-A>..<OID-B> <COMMIT-B> -> master <OID-A>..<OID-B> <COMMIT-B> -> main
! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) # Refs of upstream : main(B)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL)" ' test_expect_success "cleanup ($PROTOCOL)" '
git -C "$upstream" update-ref refs/heads/master $A git -C "$upstream" update-ref refs/heads/main $A
' '

36
t/t5411/test-0023-report-unexpect-ref--porcelain.sh
View File

@ -2,45 +2,45 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/heads/master" -r "ok refs/heads/main"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : (B) refs/for/master/topic # git push : (B) refs/for/main/topic
test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" ' test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ test_must_fail git -C workbench push --porcelain origin \
$B:refs/heads/master \ $B:refs/heads/main \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
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 hook
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> ok refs/heads/master remote: proc-receive> ok refs/heads/main
remote: error: proc-receive reported status on unexpected ref: refs/heads/master remote: error: proc-receive reported status on unexpected ref: refs/heads/main
remote: # post-receive hook remote: # post-receive hook
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/master remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
To <URL/of/upstream.git> To <URL/of/upstream.git>
<COMMIT-B>:refs/heads/master <OID-A>..<OID-B> <COMMIT-B>:refs/heads/main <OID-A>..<OID-B>
! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/master <COMMIT-B> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(B) # Refs of upstream : main(B)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL/porcelain)" ' test_expect_success "cleanup ($PROTOCOL/porcelain)" '
git -C "$upstream" update-ref refs/heads/master $A git -C "$upstream" update-ref refs/heads/main $A
' '

12
t/t5411/test-0024-report-unknown-ref.sh
View File

@ -2,12 +2,12 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/for/master/topic" -r "ok refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/a/b/c/my/topic # git push : refs/for/a/b/c/my/topic
test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" '
test_must_fail git -C workbench push origin \ test_must_fail git -C workbench push origin \
@ -19,8 +19,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" '
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic
remote: # proc-receive hook remote: # proc-receive hook
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic
remote: proc-receive> ok refs/for/master/topic remote: proc-receive> ok refs/for/main/topic
remote: error: proc-receive reported status on unknown ref: refs/for/master/topic remote: error: proc-receive reported status on unknown ref: refs/for/main/topic
To <URL/of/upstream.git> To <URL/of/upstream.git>
! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status) ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status)
EOF EOF
@ -28,7 +28,7 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" '
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

12
t/t5411/test-0025-report-unknown-ref--porcelain.sh
View File

@ -2,12 +2,12 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/for/master/topic" -r "ok refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push : refs/for/a/b/c/my/topic # git push : refs/for/a/b/c/my/topic
test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" ' test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push --porcelain origin \ 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: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic
remote: # proc-receive hook remote: # proc-receive hook
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic
remote: proc-receive> ok refs/for/master/topic remote: proc-receive> ok refs/for/main/topic
remote: error: proc-receive reported status on unknown ref: refs/for/master/topic remote: error: proc-receive reported status on unknown ref: refs/for/main/topic
To <URL/of/upstream.git> To <URL/of/upstream.git>
! HEAD:refs/for/a/b/c/my/topic [remote rejected] (proc-receive failed to report status) ! HEAD:refs/for/a/b/c/my/topic [remote rejected] (proc-receive failed to report status)
Done Done
@ -29,7 +29,7 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '

36
t/t5411/test-0026-push-options.sh
View File

@ -3,19 +3,19 @@ test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/for/master/topic" -r "ok refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push -o ... : refs/for/master/topic # git push -o ... : refs/for/main/topic
test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' test_expect_success "proc-receive: not support push options ($PROTOCOL)" '
test_must_fail git -C workbench push \ test_must_fail git -C workbench push \
-o issue=123 \ -o issue=123 \
-o reviewer=user1 \ -o reviewer=user1 \
origin \ origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
test_i18ngrep "fatal: the receiving end does not support push options" \ 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 && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -32,9 +32,9 @@ test_expect_success "enable push options ($PROTOCOL)" '
git -C "$upstream" config receive.advertisePushOptions true git -C "$upstream" config receive.advertisePushOptions true
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push -o ... : next(A) refs/for/master/topic # git push -o ... : next(A) refs/for/main/topic
test_expect_success "proc-receive: push with options ($PROTOCOL)" ' test_expect_success "proc-receive: push with options ($PROTOCOL)" '
git -C workbench push \ git -C workbench push \
--atomic \ --atomic \
@ -42,38 +42,38 @@ test_expect_success "proc-receive: push with options ($PROTOCOL)" '
-o reviewer=user1 \ -o reviewer=user1 \
origin \ origin \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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 hook
remote: proc-receive: atomic push_options 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< issue=123
remote: proc-receive< reviewer=user1 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 hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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> To <URL/of/upstream.git>
* [new branch] HEAD -> next * [new branch] HEAD -> next
* [new reference] HEAD -> refs/for/master/topic * [new reference] HEAD -> refs/for/main/topic
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) next(A) # Refs of upstream : main(A) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL)" ' test_expect_success "cleanup ($PROTOCOL)" '
git -C "$upstream" update-ref -d refs/heads/next git -C "$upstream" update-ref -d refs/heads/next
' '

36
t/t5411/test-0027-push-options--porcelain.sh
View File

@ -3,20 +3,20 @@ test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL
write_script "$upstream/hooks/proc-receive" <<-EOF write_script "$upstream/hooks/proc-receive" <<-EOF
printf >&2 "# proc-receive hook\n" printf >&2 "# proc-receive hook\n"
test-tool proc-receive -v \ test-tool proc-receive -v \
-r "ok refs/for/master/topic" -r "ok refs/for/main/topic"
EOF EOF
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push -o ... : refs/for/master/topic # git push -o ... : refs/for/main/topic
test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain)" ' test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain)" '
test_must_fail git -C workbench push \ test_must_fail git -C workbench push \
--porcelain \ --porcelain \
-o issue=123 \ -o issue=123 \
-o reviewer=user1 \ -o reviewer=user1 \
origin \ origin \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
test_i18ngrep "fatal: the receiving end does not support push options" \ 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 && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -33,9 +33,9 @@ test_expect_success "enable push options ($PROTOCOL/porcelain)" '
git -C "$upstream" config receive.advertisePushOptions true git -C "$upstream" config receive.advertisePushOptions true
' '
# Refs of upstream : master(A) # Refs of upstream : main(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
# git push -o ... : next(A) refs/for/master/topic # git push -o ... : next(A) refs/for/main/topic
test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" ' test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" '
git -C workbench push \ git -C workbench push \
--porcelain \ --porcelain \
@ -44,39 +44,39 @@ test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" '
-o reviewer=user1 \ -o reviewer=user1 \
origin \ origin \
HEAD:refs/heads/next \ HEAD:refs/heads/next \
HEAD:refs/for/master/topic \ HEAD:refs/for/main/topic \
>out 2>&1 && >out 2>&1 &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
remote: # pre-receive hook remote: # pre-receive hook
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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 hook
remote: proc-receive: atomic push_options 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< issue=123
remote: proc-receive< reviewer=user1 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 hook
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next 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> To <URL/of/upstream.git>
* HEAD:refs/heads/next [new branch] * HEAD:refs/heads/next [new branch]
* HEAD:refs/for/master/topic [new reference] * HEAD:refs/for/main/topic [new reference]
Done Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-A> refs/heads/master <COMMIT-A> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : master(A) next(A) # Refs of upstream : main(A) next(A)
# Refs of workbench: master(A) tags/v123 # Refs of workbench: main(A) tags/v123
test_expect_success "cleanup ($PROTOCOL/porcelain)" ' test_expect_success "cleanup ($PROTOCOL/porcelain)" '
git -C "$upstream" update-ref -d refs/heads/next git -C "$upstream" update-ref -d refs/heads/next
' '