Skip to content

Commit 3d141d8

Browse files
committed
Merge branch 'rs/range-diff-avoid-segfault-with-I'
"git range-diff -I... <range> <range>" segfaulted, which has been corrected. * rs/range-diff-avoid-segfault-with-I: range-diff: avoid segfault with -I
2 parents 1ea5e46 + 709b3f3 commit 3d141d8

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

range-diff.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ static void output(struct string_list *a, struct string_list *b,
482482
else
483483
diff_setup(&opts);
484484

485+
opts.no_free = 1;
485486
if (!opts.output_format)
486487
opts.output_format = DIFF_FORMAT_PATCH;
487488
opts.flags.suppress_diff_headers = 1;
@@ -542,6 +543,8 @@ static void output(struct string_list *a, struct string_list *b,
542543
strbuf_release(&buf);
543544
strbuf_release(&dashes);
544545
strbuf_release(&indent);
546+
opts.no_free = 0;
547+
diff_free(&opts);
545548
}
546549

547550
int show_range_diff(const char *range1, const char *range2,

0 commit comments

Comments
 (0)