Merge branch 'fc/fast-import-broken-marks-file'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 19:40:53 +0000 (12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 19:40:53 +0000 (12:40 -0700)
"git fast-import --export-marks" would overwrite the existing marks
file even when it makes a dump from its custom die routine.
Prevent it from doing so when we have an import-marks file but
haven't finished reading it.

* fc/fast-import-broken-marks-file:
fast-import: do not truncate exported marks file

No differences found