diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:53 +0900 |
| commit | 69b050eeb8e6a7dceec1de4ab6e974d1787def9f (patch) | |
| tree | 77de045610e96cbeed0b5950ad1ff7448fe53cab | |
| parent | 965993d1ef59fe1667a0e32c213569be6a6535af (diff) | |
| parent | 71406ed4d6d21fbe0ee0e068159739a7476f3039 (diff) | |
| download | git-69b050eeb8e6a7dceec1de4ab6e974d1787def9f.tar.gz | |
Merge branch 'jk/alternate-ref-optim'
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 ' |