range-diff: internally force `diff.noprefix=true`
When parsing the diffs, `range-diff` expects to see the prefixes `a/` and `b/` in the diff headers. These prefixes can be forced off via the config setting `diff.noprefix=true`. As `range-diff` is not prepared for that situation, this will cause a segmentation fault. Let's avoid that by passing the `--no-prefix` option to the `git log` process that generates the diffs that `range-diff` wants to parse. And of course expect the output to have no prefixes, then. Reported-by: Michal Suchánek <msuchanek@suse.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 2, 2019 at 14:10 UTC
937b76ed4970214837314e26265b78793e6653ed
2 files changed
+6
-1
range-diff.c
+2
-1
@@ -52,6 +52,7 @@ static int read_patches(const char *range, struct string_list *list)
52
53
argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
54
"--reverse", "--date-order", "--decorate=no",
55
+ "--no-prefix",
56
/*
57
* Choose indicators that are not used anywhere
58
* else in diffs, but still look reasonable
@@ -111,7 +112,7 @@ static int read_patches(const char *range, struct string_list *list)
112
if (!util->diff_offset)
113
util->diff_offset = buf.len;
114
line[len - 1] = '\n';
114
- len = parse_git_diff_header(&root, &linenr, 1, line,
115
+ len = parse_git_diff_header(&root, &linenr, 0, line,
116
len, size, &patch);
117
if (len < 0)
118
die(_("could not parse git header '%.*s'"), (int)len, line);
t/t3206-range-diff.sh
+4
@@ -354,4 +354,8 @@ test_expect_success 'format-patch --range-diff as commentary' '
354
grep "> 1: .* new message" 0001-*
355
'
356
357
+test_expect_success 'range-diff overrides diff.noprefix internally' '
358
+ git -c diff.noprefix=true range-diff HEAD^...
359
+'
360
+
361
test_done