On Wed, Oct 02, 2019 at 11:05:13AM -0700, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin <johannes.schindelin@xxxxxx> > > 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 forcing `diff.noprefix=false` just for that all to > `git log` that generates the diffs that `range-diff` wants to parse. > > Noticed-by: Michal Suchánek <msuchanek@xxxxxxx> > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> Tested-by: Michal Suchánek <msuchanek@xxxxxxx> Thanks Michal > --- > range-diff.c | 3 ++- > t/t3206-range-diff.sh | 4 ++++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/range-diff.c b/range-diff.c > index ba1e9a4265..8cc348b4cb 100644 > --- a/range-diff.c > +++ b/range-diff.c > @@ -50,7 +50,8 @@ static int read_patches(const char *range, struct string_list *list) > int offset, len; > size_t size; > > - argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges", > + argv_array_pushl(&cp.args, "-c", "diff.noprefix=false", > + "log", "--no-color", "-p", "--no-merges", > "--reverse", "--date-order", "--decorate=no", > /* > * Choose indicators that are not used anywhere > diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh > index 0120f769f1..64b66f2094 100755 > --- a/t/t3206-range-diff.sh > +++ b/t/t3206-range-diff.sh > @@ -461,4 +461,8 @@ test_expect_success 'format-patch --range-diff as commentary' ' > grep "> 1: .* new message" 0001-* > ' > > +test_expect_success 'range-diff overrides diff.noprefix internally' ' > + git -c diff.noprefix=true range-diff HEAD^... > +' > + > test_done > -- > gitgitgadget
