8388a64cd1
SZEDER reported that t5411 failed in Travis CI's s390x environment a
couple of times, and could be reproduced with '--stress' test on this
specific environment. The test failure messages might look like this:
+ test_cmp expect actual
--- expect 2021-01-17 21:55:23.430750004 +0000
+++ actual 2021-01-17 21:55:23.430750004 +0000
@@ -1 +1 @@
-<COMMIT-A> refs/heads/main
+<COMMIT-A> refs/heads/maifatal: the remote end hung up unexpectedly
error: last command exited with $?=1
not ok 86 - proc-receive: not support push options (builtin protocol)
The file 'actual' is filtered from the file 'out' which contains result
of 'git show-ref' command. Due to the error messages from other process
is written into the file 'out' accidentally, t5411 failed. SZEDER finds
the root cause of this issue:
- 'git push' is executed with its standard output and error redirected
to the file 'out'.
- 'git push' executes 'git receive-pack' internally, which inherits
the open file descriptors, so its output and error goes into that
same 'out' file.
- 'git push' ends without waiting for the close of 'git-receive-pack'
for some cases, and the file 'out' is reused for test of
'git show-ref' afterwards.
- A mixture of the output of 'git show-ref' abd 'git receive-pack'
leads to this issue.
The first intuitive reaction to resolve this issue is to remove the
file 'out' after use, so that the newly created file 'out' will have a
different file descriptor and will not be overwritten by the
'git receive-pack' process. But Johannes pointed out that removing an
open file is not possible on Windows. So we use different temporary
file names to store the output of 'git push' to solve this issue.
Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Helped-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
147 lines
4.9 KiB
Bash
147 lines
4.9 KiB
Bash
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push : main(B) next(A)
|
|
test_expect_success "git-push ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
$B:refs/heads/main \
|
|
HEAD:refs/heads/next \
|
|
>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/main
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
|
|
To <URL/of/upstream.git>
|
|
<COMMIT-B>:refs/heads/main <OID-A>..<OID-B>
|
|
* HEAD:refs/heads/next [new branch]
|
|
Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git -C "$upstream" show-ref >out &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
<COMMIT-B> refs/heads/main
|
|
<COMMIT-A> refs/heads/next
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Refs of upstream : main(B) next(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push --atomic: main(A) next(B)
|
|
test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" '
|
|
test_must_fail git -C workbench push --atomic --porcelain origin \
|
|
main \
|
|
$B:refs/heads/next \
|
|
>out-$test_count 2>&1 &&
|
|
filter_out_user_friendly_and_stable_output \
|
|
-e "s/^# GETTEXT POISON #//" \
|
|
-e "/^To / { p; }" \
|
|
-e "/^! / { p; }" \
|
|
<out-$test_count >actual &&
|
|
cat >expect <<-EOF &&
|
|
To <URL/of/upstream.git>
|
|
! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
|
|
! <COMMIT-B>:refs/heads/next [rejected] (atomic push failed)
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git -C "$upstream" show-ref >out &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
<COMMIT-B> refs/heads/main
|
|
<COMMIT-A> refs/heads/next
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Refs of upstream : main(B) next(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push : main(A) next(B)
|
|
test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" '
|
|
test_must_fail git \
|
|
-C workbench \
|
|
-c advice.pushUpdateRejected=false \
|
|
push --porcelain origin \
|
|
main \
|
|
$B:refs/heads/next \
|
|
>out-$test_count 2>&1 &&
|
|
make_user_friendly_and_stable_output <out-$test_count >actual &&
|
|
cat >expect <<-EOF &&
|
|
remote: # pre-receive hook
|
|
remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next
|
|
To <URL/of/upstream.git>
|
|
<COMMIT-B>:refs/heads/next <OID-A>..<OID-B>
|
|
! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
|
|
Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git -C "$upstream" show-ref >out &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
<COMMIT-B> refs/heads/main
|
|
<COMMIT-B> refs/heads/next
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Refs of upstream : main(B) next(B)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git-push -f : main(A) NULL tags/v123 refs/review/main/topic(A) a/b/c(A)
|
|
test_expect_success "git-push -f ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain -f origin \
|
|
refs/tags/v123 \
|
|
:refs/heads/next \
|
|
main \
|
|
main:refs/review/main/topic \
|
|
HEAD:refs/heads/a/b/c \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
remote: # pre-receive hook
|
|
remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main
|
|
remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next
|
|
remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic
|
|
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
|
|
remote: # post-receive hook
|
|
remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main
|
|
remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next
|
|
remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic
|
|
remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
|
|
To <URL/of/upstream.git>
|
|
+ refs/heads/main:refs/heads/main <OID-B>...<OID-A> (forced update)
|
|
- :refs/heads/next [deleted]
|
|
* refs/tags/v123:refs/tags/v123 [new tag]
|
|
* refs/heads/main:refs/review/main/topic [new reference]
|
|
* HEAD:refs/heads/a/b/c [new branch]
|
|
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/a/b/c
|
|
<COMMIT-A> refs/heads/main
|
|
<COMMIT-A> refs/review/main/topic
|
|
<TAG-v123> refs/tags/v123
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL/porcelain)" '
|
|
(
|
|
cd "$upstream" &&
|
|
git update-ref -d refs/review/main/topic &&
|
|
git update-ref -d refs/tags/v123 &&
|
|
git update-ref -d refs/heads/a/b/c
|
|
)
|
|
'
|