On Fri, Mar 02, 2018 at 01:19:35AM +0000, Sam Kuper wrote:
> The bug is that in the midst of running
>
> git -c interactive.diffFilter="git diff --word-diff --color" add --patch
That's not how interactive.diffFilter is supposed to work.
It's meant to have the output of an existing diff piped into it.
Generating the diff anew will appear to work for some simple cases, but
fall down for others:
1. Any of the flavors besides "add -p" will be running the wrong diff
(e.g., "reset -p" runs a diff between the index and HEAD).
2. Any pathspec limiters would be ignored (e.g., "add -p file").
3. Your invocation in particular is a problem because it uses
--word-diff, which will not have a one-to-one line correspondence
with the bare diff.
add--interactive handles pretty-printing by running the diff
command twice: once with no special options, and once with
"--color" and piped through the diffFilter. It assumes that the two
match each other line for line, so it shows you the "DISPLAY"
variant, but then ultimately applies the "TEXT" variant.
And that last one is the cause of the errors you see:
> Use of uninitialized value $_ in print at
> /usr/lib/git-core/git-add--interactive line 1371, <STDIN> line 74.
The "DISPLAY" run for your case generates fewer lines than the "TEXT"
run, and we complain on trying to show those extra lines.
Unfortunately, I don't think there's an easy way to do what you want
(show word-diffs but apply the full diff).
-Peff
