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>
92 lines
3.6 KiB
Bash
92 lines
3.6 KiB
Bash
test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/next/topic2" \
|
|
-r "ng refs/for/next/topic1 fail to call Web API" \
|
|
-r "ok refs/for/master/topic" \
|
|
-r "option refname 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 : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/master/topic(A)
|
|
test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcelain)" '
|
|
test_must_fail git -C workbench push --porcelain origin \
|
|
$B:refs/heads/master \
|
|
HEAD:refs/heads/bar \
|
|
HEAD:refs/heads/baz \
|
|
HEAD:refs/for/next/topic2 \
|
|
HEAD:refs/for/next/topic1 \
|
|
HEAD:refs/heads/foo \
|
|
HEAD:refs/for/master/topic \
|
|
HEAD:refs/for/next/topic3 \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
remote: # pre-receive hook
|
|
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/master
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3
|
|
remote: # proc-receive hook
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
|
|
remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3
|
|
remote: proc-receive> ok refs/for/next/topic2
|
|
remote: proc-receive> ng refs/for/next/topic1 fail to call Web API
|
|
remote: proc-receive> ok refs/for/master/topic
|
|
remote: proc-receive> option refname 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/heads/master
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
|
|
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic
|
|
To <URL/of/upstream.git>
|
|
<COMMIT-B>:refs/heads/master <OID-A>..<OID-B>
|
|
* HEAD:refs/heads/bar [new branch]
|
|
* HEAD:refs/heads/baz [new branch]
|
|
* HEAD:refs/for/next/topic2 [new reference]
|
|
* HEAD:refs/heads/foo [new branch]
|
|
HEAD:refs/for/master/topic <OID-A>..<OID-B>
|
|
! HEAD:refs/for/next/topic1 [remote rejected] (fail to call Web API)
|
|
! HEAD:refs/for/next/topic3 [remote rejected] (proc-receive failed to report status)
|
|
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/bar
|
|
<COMMIT-A> refs/heads/baz
|
|
<COMMIT-A> refs/heads/foo
|
|
<COMMIT-B> refs/heads/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Refs of upstream : master(B) foo(A) bar(A)) baz(A)
|
|
# Refs of workbench: master(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL/porcelain)" '
|
|
(
|
|
cd "$upstream" &&
|
|
git update-ref refs/heads/master $A &&
|
|
git update-ref -d refs/heads/foo &&
|
|
git update-ref -d refs/heads/bar &&
|
|
git update-ref -d refs/heads/baz
|
|
)
|
|
|
|
'
|