Merge branch 'jt/fast-export-copy-modify-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Sep 2017 02:23:42 +0000 (11:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Sep 2017 02:23:42 +0000 (11:23 +0900)
commit8096e1d385660c159d9d47e69b2be63cf22e4f31
tree5d872b092c812f3365aa0e5c078edb6c3395abc3
parent8c1bc7c244bf19e5c9fe5caa74389c022b8d24bc
parentb3e8ca89cfe34712a093c37fdbac7df7eaae91e7
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
builtin/fast-export.c
t/t9350-fast-export.sh