diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:14 +0900 |
| commit | a07148db319e8d0080ba2b7fc85501cd7bbba6b5 (patch) | |
| tree | 2eea94aeafd12814210d3e4427bf13b8f74e0938 | |
| parent | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint (diff) | |
| parent | t5400: avoid concurrent writes into a trace file (diff) | |
| download | tgif-a07148db319e8d0080ba2b7fc85501cd7bbba6b5.tar.xz | |
Merge branch 'jk/alternate-ref-optim' into maint
A test allowed both "git push" and "git receive-pack" on the other
end write their traces into the same file. This is OK on platforms
that allows atomically appending to a file opened with O_APPEND,
but on other platforms led to a mangled output, causing
intermittent test failures. This has been fixed by disabling
traces from "receive-pack" in the test.
* jk/alternate-ref-optim:
t5400: avoid concurrent writes into a trace file
| -rwxr-xr-x | t/t5400-send-pack.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 3331e0f534..d375d7110d 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -288,7 +288,10 @@ test_expect_success 'receive-pack de-dupes .have lines' ' $shared .have EOF - GIT_TRACE_PACKET=$(pwd)/trace git push fork HEAD:foo && + GIT_TRACE_PACKET=$(pwd)/trace \ + git push \ + --receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \ + fork HEAD:foo && extract_ref_advertisement <trace >refs && test_cmp expect refs ' |