From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2016 19:40:53 +0000 (-0700)
Subject: Merge branch 'fc/fast-import-broken-marks-file'
X-Git-Tag: v2.9.0-rc1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc4b9247df12e668b93cca85d6a5415e6b007368;p=thirdparty%2Fgit.git

Merge branch 'fc/fast-import-broken-marks-file'

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

bc4b9247df12e668b93cca85d6a5415e6b007368