git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Sam Kuper <sam.kuper@uclmail.net>,
	git@vger.kernel.org
Subject: Re: [PATCH 2/2] add--interactive: detect bogus diffFilter output
Date: Mon, 5 Mar 2018 21:56:27 +0100	[thread overview]
Message-ID: <20180305205626.GD5953@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqsh9e8css.fsf@gitster-ct.c.googlers.com>

On Mon, Mar 05, 2018 at 12:53:07PM -0800, Junio C Hamano wrote:

> Jeff King <peff@peff.net> writes:
> 
> > It's important that the diff-filter only filter the
> > individual lines, and that there remain a one-to-one mapping
> > between the input and output lines. Otherwise, things like
> > hunk-splitting will behave quite unexpectedly (e.g., you
> > think you are splitting at one point, but it has a different
> > effect in the text patch we apply).
> >
> > We can't detect all problematic cases, but we can at least
> > catch the obvious case where we don't even have the correct
> > number of lines.
> 
> Will queue.  We could probably also make sure that each of the
> corresponding line pair begins with the same '-/ /+' letter, but we
> need to draw a line and stop somewhere, and I think the number of
> lines is probably a good enough place.

I think that would break things like diff-so-fancy, which actually
removes the -/+ in favor of pure coloring (not something I care for
myself, but it seems a legitimate use case). So it's probably best not
to look at the content, not just from a "we can only go so far"
perspective but also because we actively don't know what the filter's
output is supposed to look like.

-Peff

  reply	other threads:[~2018-03-05 20:56 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-02  1:19 Bug report: "Use of uninitialized value $_ in print" Sam Kuper
2018-03-02  7:04 ` Jonathan Nieder
2018-03-02 10:46   ` Jeff King
2018-03-02 16:53     ` Junio C Hamano
2018-03-02 16:55       ` Jeff King
2018-03-02 17:15         ` Junio C Hamano
2018-03-03  5:57           ` Jeff King
2018-03-03  5:58             ` [PATCH 1/2] t3701: add a test for interactive.diffFilter Jeff King
2018-03-03  5:58             ` [PATCH 2/2] add--interactive: detect bogus diffFilter output Jeff King
2018-03-05 20:53               ` Junio C Hamano
2018-03-05 20:56                 ` Jeff King [this message]
2018-03-05 21:33               ` Ævar Arnfjörð Bjarmason
2018-03-05 22:09                 ` Junio C Hamano
2018-03-05 22:15                   ` Ævar Arnfjörð Bjarmason
2018-03-05 21:54             ` Bug report: "Use of uninitialized value $_ in print" Jonathan Nieder
2018-03-02 17:28   ` Sam Kuper
2018-03-02 10:42 ` Jeff King
2018-03-02 17:30   ` Sam Kuper
2018-03-03  6:02     ` Jeff King
2018-03-02 17:48   ` Junio C Hamano
2018-03-02 20:34     ` Sam Kuper
2018-03-02 21:53       ` Junio C Hamano
2018-03-03  6:18         ` Jeff King

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180305205626.GD5953@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=sam.kuper@uclmail.net \
    /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.
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 NNTP newsgroup(s).