Skip to content

Commit fa6f225

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 268fbcd commit fa6f225

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/add.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
239239
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
240240
rev.diffopt.use_color = 0;
241241
rev.diffopt.flags.ignore_dirty_submodules = 1;
242-
out = open(file, O_CREAT | O_WRONLY, 0666);
242+
out = open(file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
243243
if (out < 0)
244244
die(_("Could not open '%s' for writing."), file);
245245
rev.diffopt.file = xfdopen(out, "w");

0 commit comments

Comments
 (0)