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, 18:38 UTC
- Message-ID
- <2qpp7417-79qr-364s-3798-r471sp6ron54@tzk.qr>
- In-Reply-To
- <s40ss309-3311-o08s-38r2-9144r33pq549@tzk.qr>
Hi Philippe,
On Tue, 23 Aug 2022, Johannes Schindelin wrote:
Show 22 quoted lines
> 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.
Seems that the Git mailing list is taking a mental health care day... it took a while for the quoted reply to show up, and while I submitted https://github.com/gitgitgadget/git/pull/1336 half an hour ago, it also has yet to arrive...
Ciao, Dscho