From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Sep 2017 02:23:42 +0000 (+0900)
Subject: Merge branch 'jt/fast-export-copy-modify-fix'
X-Git-Tag: v2.15.0-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8096e1d385660c159d9d47e69b2be63cf22e4f31;p=thirdparty%2Fgit.git

Merge branch 'jt/fast-export-copy-modify-fix'

"git fast-export" with -M/-C option issued "copy" instruction on a
path that is simultaneously modified, which was incorrect.

* jt/fast-export-copy-modify-fix:
  fast-export: do not copy from modified file
---

8096e1d385660c159d9d47e69b2be63cf22e4f31