mirror of
https://github.com/git/git.git
synced 2024-06-23 01:09:15 +02:00
8f0a264524
This trick was performed via $ sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t/t5411/test-00[3-5]* We do not convert the files in `t/t5411/` in one go because the patch would be too big (mails larger than 100kB are rejected by the Git mailing list). Instead, we start with roughly half of the support files. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
266 lines
9.8 KiB
Bash
266 lines
9.8 KiB
Bash
test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/porcelain)" '
|
|
test_must_fail git -C workbench push --porcelain origin \
|
|
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/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> option refname refs/pull/123/head
|
|
remote: proc-receive> option old-oid <COMMIT-B>
|
|
remote: error: proc-receive reported "option" without a matching "ok/ng" directive
|
|
To <URL/of/upstream.git>
|
|
! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
|
|
Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/123/head"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
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/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: proc-receive> option refname refs/pull/123/head
|
|
remote: # post-receive hook
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head
|
|
To <URL/of/upstream.git>
|
|
* HEAD:refs/pull/123/head [new reference]
|
|
Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option forced-update"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
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/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: proc-receive> option refname refs/pull/123/head
|
|
remote: proc-receive> option forced-update
|
|
remote: # post-receive hook
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head
|
|
To <URL/of/upstream.git>
|
|
* HEAD:refs/pull/123/head [new reference]
|
|
Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
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/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: proc-receive> option refname refs/pull/123/head
|
|
remote: proc-receive> option old-oid <COMMIT-B>
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head
|
|
To <URL/of/upstream.git>
|
|
HEAD:refs/pull/123/head <OID-B>..<OID-A>
|
|
Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
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/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: proc-receive> option old-oid <COMMIT-B>
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic
|
|
To <URL/of/upstream.git>
|
|
HEAD:refs/for/main/topic <OID-B>..<OID-A>
|
|
Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option old-oid $A" \
|
|
-r "option new-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
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/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: proc-receive> option old-oid <COMMIT-A>
|
|
remote: proc-receive> option new-oid <COMMIT-B>
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic
|
|
To <URL/of/upstream.git>
|
|
HEAD:refs/for/main/topic <OID-A>..<OID-B>
|
|
Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/a/b/c/topic" \
|
|
-r "ok refs/for/next/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/124/head" \
|
|
-r "option old-oid $B" \
|
|
-r "option forced-update" \
|
|
-r "option new-oid $A"
|
|
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/next/topic \
|
|
HEAD:refs/for/a/b/c/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/for/next/topic
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
|
remote: proc-receive> ok refs/for/a/b/c/topic
|
|
remote: proc-receive> ok refs/for/next/topic
|
|
remote: proc-receive> option refname refs/pull/123/head
|
|
remote: proc-receive> ok refs/for/main/topic
|
|
remote: proc-receive> option refname refs/pull/124/head
|
|
remote: proc-receive> option old-oid <COMMIT-B>
|
|
remote: proc-receive> option forced-update
|
|
remote: proc-receive> option new-oid <COMMIT-A>
|
|
remote: # post-receive hook
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic
|
|
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head
|
|
To <URL/of/upstream.git>
|
|
* HEAD:refs/pull/123/head [new reference]
|
|
* HEAD:refs/for/a/b/c/topic [new reference]
|
|
+ HEAD:refs/pull/124/head <OID-B>...<OID-A> (forced update)
|
|
Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
git -C "$upstream" show-ref >out &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
<COMMIT-A> refs/heads/main
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|