From: Eric Sunshine <sunshine@sunshineco.com>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] range-diff: internally force `diff.noprefix=false`
Date: Wed, 2 Oct 2019 14:34:29 -0400 [thread overview]
Message-ID: <CAPig+cS1XHLC3Q_Ntq=-Ck8WzRR7FL1qwQuCfUPVFSTkEKK+LQ@mail.gmail.com> (raw)
In-Reply-To: <1f84f92846bc14d21aa7339c8baa0f9bb710b17d.1570039511.git.gitgitgadget@gmail.com>
On Wed, Oct 2, 2019 at 2:05 PM Johannes Schindelin via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> 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
s/all/call/
> `git log` that generates the diffs that `range-diff` wants to parse.
>
> Noticed-by: Michal Suchánek <msuchanek@suse.de>
s/Noticed/Reported/ perhaps?
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
next prev parent reply other threads:[~2019-10-02 18:34 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 [this message]
2019-10-02 19:56 ` Michal Suchánek
2019-10-02 20:06 ` Junio C Hamano
2019-10-02 20:30 ` Johannes Schindelin
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='CAPig+cS1XHLC3Q_Ntq=-Ck8WzRR7FL1qwQuCfUPVFSTkEKK+LQ@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).