From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 May 2017 03:34:53 +0000 (+0900)
Subject: Merge branch 'jk/alternate-ref-optim'
X-Git-Tag: v2.14.0-rc0~151
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/69b050eeb8e6a7dceec1de4ab6e974d1787def9f

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
---

69b050eeb8e6a7dceec1de4ab6e974d1787def9f