From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 1/1] range-diff: internally force `diff.noprefix=false`
Date: Wed, 2 Oct 2019 22:30:26 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1910022229340.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqq4l0qewu5.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Thu, 3 Oct 2019, Junio C Hamano wrote:
> "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
>
> > - 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
>
next prev parent reply other threads:[~2019-10-02 20:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 18:05 [PATCH 0/1] Avoid segmentation fault in git range-diff when diff.noprefix=true Johannes Schindelin via GitGitGadget
2019-10-02 18:05 ` [PATCH 1/1] range-diff: internally force `diff.noprefix=false` Johannes Schindelin via GitGitGadget
2019-10-02 18:34 ` Eric Sunshine
2019-10-02 19:56 ` Michal Suchánek
2019-10-02 20:06 ` Junio C Hamano
2019-10-02 20:30 ` Johannes Schindelin [this message]
2019-10-03 0:43 ` Junio C Hamano
2019-10-03 0:41 ` Junio C Hamano
2019-10-02 21:10 ` [PATCH v2 0/1] Avoid segmentation fault in git range-diff when diff.noprefix=true Johannes Schindelin via GitGitGadget
2019-10-02 21:10 ` [PATCH v2 1/1] range-diff: internally force `diff.noprefix=true` Johannes Schindelin via GitGitGadget
2019-10-03 2:11 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1910022229340.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).