Andrew's git / gitweb.git / diff
?
Merge branch 'jt/fast-export-copy-modify-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:14:51 +0000 (14:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:14:51 +0000 (14:14 +0900)
"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

1  2 
builtin/fast-export.c patch | diff1 | diff2 | blob | history
t/t9350-fast-export.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/fast-export.c
Simple merge
diff --cc t/t9350-fast-export.sh
Simple merge