Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: In color.diff.*, these are called new, old, and plain. I am of the opinion that context is a far better name than plain, but perhaps we should support both for consistency. Here's a patch for the color.diff side, if we want to go that route. -- 8 --

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Jeff King
On Wed, May 27, 2015 at 11:57:15AM -0700, Junio C Hamano wrote: -- 8 -- Subject: diff: accept color.diff.context as a synonym for plain The term plain is a bit ambiguous; let's allow the more specific context, but keep plain around for compatibility. Signed-off-by: Jeff King

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: Do you want me to also eradicate PLAIN from the code itself? It's a rather simple change, but it does touch a lot of places. Nah, that is not user-facing. We do not do s/cache/index/ in the code, either. Besides, I actually find plain much easier to type than

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Jeff King
On Wed, May 27, 2015 at 01:46:26PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: Do you want me to also eradicate PLAIN from the code itself? It's a rather simple change, but it does touch a lot of places. Nah, that is not user-facing. We do not do s/cache/index/ in the

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, May 27, 2015 at 01:46:26PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: Do you want me to also eradicate PLAIN from the code itself? It's a rather simple change, but it does touch a lot of places. Nah, that is not user-facing.

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Jeff King
On Wed, May 27, 2015 at 03:22:18AM -0400, Jeff King wrote: In color.diff.*, these are called new, old, and plain. I am of the opinion that context is a far better name than plain, but perhaps we should support both for consistency. Here's a patch for the color.diff side, if we want to go

[PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Junio C Hamano
We paint whitespace breakages in new (i.e. added or updated) lines when showing the git diff output to help people avoid introducing them with their changes. The basic premise is that people would want to avoid touching existing lines only to fix whitespace errors in a patch that does other

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Jeff King
On Tue, May 26, 2015 at 11:30:28PM -0700, Junio C Hamano wrote: The fourth one in v2 used a new option --[no-]ws-check-deleted, but in this round a new option --ws-error-highlight=kinds is defined instead. With that, you can say diff --ws-error-highlight=new,old to say I want to