| commit | fa6f225e0141ec0df1e131e894a3a7d7dea168f5 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 15 Jan 2019 15:42:52 +0000 (15 07:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jan 2019 18:51:21 +0000 (15 10:51 -0800) | ||
| tree | 5508eb1b322203531c943fb4048c1d925f3c7d56 | treesnapshot (tar.gz zip) |
| parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd | commitdiff |
add --edit: truncate the patch file
If there is already a .git/ADD_EDIT.patch file, we fail to truncate it
properly, which could result in very funny errors.
Of course, this file should not be left lying around. But at least in
one case, there was a stale copy, larger than the current diff. So the
result was a corrupt diff.
Let's just truncate the file when we write it and not worry about it too
much.
Reported by J Wyman.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If there is already a .git/ADD_EDIT.patch file, we fail to truncate it
properly, which could result in very funny errors.
Of course, this file should not be left lying around. But at least in
one case, there was a stale copy, larger than the current diff. So the
result was a corrupt diff.
Let's just truncate the file when we write it and not worry about it too
much.
Reported by J Wyman.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/add.c | diffblobblamehistory |