mirror of
https://github.com/git/git.git
synced 2024-09-28 16:13:01 +02:00
63518a574a
The new introduced "proc-receive" hook may handle a command for a
pseudo-reference with a zero-old as its old-oid, while the hook may
create or update a reference with different name, different new-oid,
and different old-oid (the reference may exist already with a non-zero
old-oid). Current "report-status" protocol cannot report the status for
such reference rewrite.
Add new capability "report-status-v2" and new report protocol which is
not backward compatible for report of git-push.
If a user pushes to a pseudo-reference "refs/for/master/topic", and
"receive-pack" creates two new references "refs/changes/23/123/1" and
"refs/changes/24/124/1", for client without the knowledge of
"report-status-v2", "receive-pack" will only send "ok/ng" directives in
the report, such as:
ok ref/for/master/topic
But for client which has the knowledge of "report-status-v2",
"receive-pack" will use "option" directives to report more attributes
for the reference given by the above "ok/ng" directive.
ok refs/for/master/topic
option refname refs/changes/23/123/1
option new-oid <new-oid>
ok refs/for/master/topic
option refname refs/changes/24/124/1
option new-oid <new-oid>
The client will report two new created references to the end user.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
266 lines
9.9 KiB
Bash
266 lines
9.9 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 : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/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/master/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/master/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/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/master/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/master/topic" \
|
|
-r "option refname refs/pull/123/head"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A)
|
|
test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/master/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/master/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: proc-receive> ok refs/for/master/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/master/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option forced-update"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A)
|
|
test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/master/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/master/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: proc-receive> ok refs/for/master/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/master/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A)
|
|
test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/master/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/master/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: proc-receive> ok refs/for/master/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/master/topic" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A)
|
|
test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/master/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/master/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: proc-receive> ok refs/for/master/topic
|
|
remote: proc-receive> option old-oid <COMMIT-B>
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/master/topic
|
|
To <URL/of/upstream.git>
|
|
HEAD:refs/for/master/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/master/topic" \
|
|
-r "option old-oid $A" \
|
|
-r "option new-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/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/master/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/master/topic
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: proc-receive> ok refs/for/master/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/master/topic
|
|
To <URL/of/upstream.git>
|
|
HEAD:refs/for/master/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/master/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 : master(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/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/master/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/master/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/master/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/master/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/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|