Quantcast

Highlighting whitespace on removal with git diff

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Highlighting whitespace on removal with git diff

Stonky Fandango
When I do say 'git diff', and I have added a line with a trailing
whitespace, i get a red square box highlighting the added whitespace.
(on the '+' diff line)
What I want, is the reverse - so when I delete an existing whitespace,
I get something similar, for example a blue box highlighting the
deleted whitespace (on the '-' diff line)

Currently the only notificate I get is identical
'-' and '+' diff lines, but no indication of the whitespace deleted

I know I can do this with graphical tools, but ideally would like some way
using the standard console git diff - if this is possible.

I have  the following in my .gitconfig
---
[color "diff"]
whitespace = red reverse
[core]
 whitespace=-indent-with-non-tab,trailing-space,cr-at-eol,tab-in-indent
---

Thanks,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Highlighting whitespace on removal with git diff

Kevin Ballard
The highlight isn't telling you what changed on the line. It's telling you that this added line has trailing whitespace, and your core.whitespace config value is set such that this is considered an error.

-Kevin Ballard

On Oct 19, 2010, at 5:46 PM, Stonky Fandango wrote:

> When I do say 'git diff', and I have added a line with a trailing
> whitespace, i get a red square box highlighting the added whitespace.
> (on the '+' diff line)
> What I want, is the reverse - so when I delete an existing whitespace,
> I get something similar, for example a blue box highlighting the
> deleted whitespace (on the '-' diff line)
>
> Currently the only notificate I get is identical
> '-' and '+' diff lines, but no indication of the whitespace deleted
>
> I know I can do this with graphical tools, but ideally would like some way
> using the standard console git diff - if this is possible.
>
> I have  the following in my .gitconfig
> ---
> [color "diff"]
> whitespace = red reverse
> [core]
>  whitespace=-indent-with-non-tab,trailing-space,cr-at-eol,tab-in-indent
> ---
>
> Thanks,
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to [hidden email]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Highlighting whitespace on removal with git diff

Junio C Hamano
Kevin Ballard <[hidden email]> writes:

> The highlight isn't telling you what changed on the line. It's telling
> you that this added line has trailing whitespace, and your
> core.whitespace config value is set such that this is considered an
> error.
>
> -Kevin Ballard

Which means that, in order to check for a whitespace error you removed in
your change, you can give "-R" (reverse) option to your "git diff".
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Loading...