mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-19 08:03:53 +02:00
Code

Merge branch 'rs/range-diff-avoid-segfault-with-I' into maint 

"git range-diff -I... <range> <range>" segfaulted, which has been
corrected.

* rs/range-diff-avoid-segfault-with-I:
  range-diff: avoid segfault with -I
This commit is contained in:
Junio C Hamano 2021-10-12 13:51:45 -07:00
parent 79c887d29d 709b3f32d3
commit 6aa501aab2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
range-diff.c
View File

@ -482,6 +482,7 @@ static void output(struct string_list *a, struct string_list *b,
else
diff_setup(&opts);
opts.no_free = 1;
if (!opts.output_format)
opts.output_format = DIFF_FORMAT_PATCH;
opts.flags.suppress_diff_headers = 1;
@ -542,6 +543,8 @@ static void output(struct string_list *a, struct string_list *b,
strbuf_release(&buf);
strbuf_release(&dashes);
strbuf_release(&indent);
opts.no_free = 0;
diff_free(&opts);
}
int show_range_diff(const char *range1, const char *range2,