Re: [PATCH 1/1] range-diff: internally force `diff.noprefix=false`

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 2, 2019, 20:30 UTC
Message-ID: <nycvar.QRO.7.76.6.1910022229340.46@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqq4l0qewu5.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Thu, 3 Oct 2019, Junio C Hamano wrote:

Show 11 quoted lines

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > When parsing the diffs, `range-diff` expects to see the prefixes `a/`
> > and `b/` in the diff headers.
>
> If so, passing src/dst prefix as command line option is a much better
> solution, I think.  diff.noprefix may not stay to be (or it may
> already not to be) the only thing how the prefix gets chosen.

Good point.

While at it, I invert the logic in v2: instead of forcing a prefix, I now force no prefix (and reduce the strip level from 1 to 0 when parsing the diff header).

Thanks, Dscho

Show 21 quoted lines

>
> > -	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
>