| commit | 69b050eeb8e6a7dceec1de4ab6e974d1787def9f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 May 2017 03:34:53 +0000 (29 12:34 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 May 2017 03:34:53 +0000 (29 12:34 +0900) | ||
| tree | 77de045610e96cbeed0b5950ad1ff7448fe53cab | treesnapshot (tar.gz zip) |
| parent | 965993d1ef59fe1667a0e32c213569be6a6535af | commitdiff |
| parent | 71406ed4d6d21fbe0ee0e068159739a7476f3039 | commitdiff |
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
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