[QUESTION] '--color-words' for 'git add -p'?

Valentin Haenel· Apr 29, 2011, 16:42 UTC · lore

Hi,

is it possible to use some kind of magic to get 'git add -p' to display diff with '--color-words' option? I tried GIT_DIFF_OPTS but w/o success.

thx

V-

Jeff King· Apr 29, 2011, 22:38 UTC · re: Valentin Haenel · lore

Re: [QUESTION] '--color-words' for 'git add -p'?

On Fri, Apr 29, 2011 at 06:42:10PM +0200, Valentin Haenel wrote:

> is it possible to use some kind of magic to get 'git add -p' to display
> diff with '--color-words' option? I tried GIT_DIFF_OPTS but w/o success.

No, it's not currently. The output of --color-words cannot be applied as a patch, so we would have to do something like diff an extra time, match up the hunks, show the user one hunk, and then apply the other.

In fact, that is what we already do to get color at all. It works very well there, since we know the hunks will match exactly. I'm not 100% sure, though, that color-words will produce exactly the same set of hunks that a regular line-oriented diff will. Which would be a problem.

-Peff