git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3913c2 f4beed6)
Merge branch 'fc/fast-import-broken-marks-file'
authorJunio C Hamano <redacted>
Tue, 31 May 2016 19:40:53 +0000 (12:40 -0700)
committerJunio C Hamano <redacted>
Tue, 31 May 2016 19:40:53 +0000 (12:40 -0700)
commitbc4b9247df12e668b93cca85d6a5415e6b007368
tree8fe06b21d28f00c5a1fdd0d3b95b937f396ef6c8tree | snapshot
parentf3913c2d03abc660140678a9e14dac399f847647commit | diff
parentf4beed60d5ef3fdbd31ac5bd3162182fdf2bf0d3commit | diff
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
fast-import.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT