diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-15 20:15:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-15 20:15:27 (GMT) |
| commit | 3d141d87897676b81990fb47cdd75a562dd5dad9 (patch) | |
| tree | 2d2a67aec662465d5b16bb691099d30c77aa5fb0 /range-diff.c | |
| parent | 1ea5e46cb96d17c3b3927b4eff9765183cf87f8d (diff) | |
| parent | 709b3f32d333df1e29dbb073b4e9e834f130a989 (diff) | |
| download | git-3d141d87897676b81990fb47cdd75a562dd5dad9.zip git-3d141d87897676b81990fb47cdd75a562dd5dad9.tar.gz git-3d141d87897676b81990fb47cdd75a562dd5dad9.tar.bz2 | |
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
Diffstat (limited to 'range-diff.c')
| -rw-r--r-- | range-diff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/range-diff.c b/range-diff.c index e731525..cac89a2 100644 --- a/range-diff.c +++ b/range-diff.c @@ -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, |