| commit | bc4b9247df12e668b93cca85d6a5415e6b007368 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2016 19:40:53 +0000 (31 12:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2016 19:40:53 +0000 (31 12:40 -0700) | ||
| tree | 8fe06b21d28f00c5a1fdd0d3b95b937f396ef6c8 | treesnapshot (tar.gz zip) |
| parent | f3913c2d03abc660140678a9e14dac399f847647 | commitdiff |
| parent | f4beed60d5ef3fdbd31ac5bd3162182fdf2bf0d3 | commitdiff |
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
"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 | blobhistory |