| commit | a07148db319e8d0080ba2b7fc85501cd7bbba6b5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:03:14 +0000 (5 09:03 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:03:14 +0000 (5 09:03 +0900) | ||
| tree | 2eea94aeafd12814210d3e4427bf13b8f74e0938 | treesnapshot (tar.gz zip) |
| parent | 00c0e40f020581ff010a3efd96243bf0ae726fb0 | commitdiff |
| parent | 71406ed4d6d21fbe0ee0e068159739a7476f3039 | commitdiff |
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
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