mirror of
https://github.com/git/git
synced 2024-09-19 08:21:36 +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>
44 lines
1.5 KiB
Bash
44 lines
1.5 KiB
Bash
test_expect_success "setup proc-receive hook (fall-through, $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 fall-through"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/main/topic(B)
|
|
test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
$B:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option fall-through Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic Z
|
|
> To <URL/of/upstream.git>
|
|
> * <COMMIT-B>:refs/for/main/topic [new reference]
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-B> refs/for/main/topic
|
|
<COMMIT-A> refs/heads/main
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A) refs/for/main/topic(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL/porcelain)" '
|
|
git -C "$upstream" update-ref -d refs/for/main/topic
|
|
'
|