Re: Regression in 'git add -p' with 'interactive.diffFilter' since builtin version is default

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 23, 2022, 13:08 UTC
Message-ID: <s40ss309-3311-o08s-38r2-9144r33pq549@tzk.qr>
In-Reply-To: <ecf6f5be-22ca-299f-a8f1-bda38e5ca246@gmail.com>

Hi Philippe,

On Mon, 22 Aug 2022, Philippe Blain wrote:

Show 7 quoted lines

> 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