mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
2bafb3d702
Before comparing with the expect file, we used to call function "make_user_friendly_and_stable_output" to filter out trailing spaces in output. Ævar recommends using pattern "s/Z$//" to prepare expect file, and then compare it with raw output. Since we have fixed the issue of occasionally missing the clear-to-eol suffix when displaying sideband #2 messages, it is safe and stable to test against raw output. Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
2.4 KiB
Bash
62 lines
2.4 KiB
Bash
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : next(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/porcelain)" '
|
|
test_must_fail git -C workbench push --porcelain origin \
|
|
HEAD:next \
|
|
HEAD:refs/for/main/topic \
|
|
>out-$test_count 2>&1 &&
|
|
make_user_friendly_and_stable_output <out-$test_count >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: error: cannot find hook "proc-receive" Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next Z
|
|
> To <URL/of/upstream.git>
|
|
> * HEAD:refs/heads/next [new branch]
|
|
> ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
|
Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-A> refs/heads/main
|
|
<COMMIT-A> refs/heads/next
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A) next(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL/porcelain)" '
|
|
git -C "$upstream" update-ref -d refs/heads/next
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# 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_must_fail git -C workbench push --porcelain --atomic origin \
|
|
$B:main \
|
|
HEAD:next \
|
|
HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
|
|
make_user_friendly_and_stable_output <out-$test_count >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: error: cannot find hook "proc-receive" Z
|
|
> To <URL/of/upstream.git>
|
|
> ! <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/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-A> refs/heads/main
|
|
EOF
|
|
'
|