From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: Regression in 'git add -p' with 'interactive.diffFilter' since builtin version is default
Date: Tue, 23 Aug 2022 15:08:40 +0200 (CEST) [thread overview]
Message-ID: <s40ss309-3311-o08s-38r2-9144r33pq549@tzk.qr> (raw)
In-Reply-To: <ecf6f5be-22ca-299f-a8f1-bda38e5ca246@gmail.com>
Hi Philippe,
On Mon, 22 Aug 2022, Philippe Blain wrote:
> I found a regression in the builtin 'add -i'. I use diff-so-fancy [1]
> as a pager and also use it via 'interactive.diffFilter'. With the
> builtin implementation, this errors with:
>
> error: could not parse colored hunk header '?[36m?[1m?[38;5;13m@ file:1 @?[1m?[0m'
>
> With the Perl version, it works fine.
Hmm. This looks different than what Peff reported in
https://lore.kernel.org/git/20201112184026.GB701197@coredump.intra.peff.net/,
where the command errored out with:
$ git -c interactive.difffilter='diff-so-fancy' add -p
fatal: mismatched output from interactive.diffFilter
hint: Your filter must maintain a one-to-one correspondence
hint: between its input and output lines.
I _think_ I have an idea how to address this. Stay tuned.
Ciao,
Dscho
next prev parent reply other threads:[~2022-08-23 16:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 22:15 Regression in 'git add -p' with 'interactive.diffFilter' since builtin version is default Philippe Blain
2022-08-23 13:08 ` Johannes Schindelin [this message]
2022-08-23 18:38 ` Johannes Schindelin
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=s40ss309-3311-o08s-38r2-9144r33pq549@tzk.qr \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.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.
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).