From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:03:14 +0000 (+0900)
Subject: Merge branch 'jk/alternate-ref-optim' into maint
X-Git-Tag: v2.13.1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a07148db319e8d0080ba2b7fc85501cd7bbba6b5;p=thirdparty%2Fgit.git

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

a07148db319e8d0080ba2b7fc85501cd7bbba6b5