Re: [PATCH 0/4] Colouring whitespace errors in diff -B output

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 15, 2009, 20:12 UTC
Message-ID: <7vab0w55mh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090915155209.6117@nanako3.lavabit.com>

Nanako Shiraishi <nanako3@lavabit.com> writes:

Show 17 quoted lines

> Quoting Junio C Hamano <gitster@pobox.com>
>
>> The last one hooks "diff -B" logic to the per-line output routines in a
>> way that mimicks how the normal patches are fed to them better, in order
>> to take advantage of all the existing whitespace error detection and
>> colouring logic.
>>
>> Junio C Hamano (4):
>>       diff.c: shuffling code around
>>       diff.c: split emit_line() from the first char and the rest of the line
>>       diff.c: emit_add_line() takes only the rest of the line
>>       diff -B: colour whitespace errors
>>
>>  diff.c |  327 +++++++++++++++++++++++++++++++++++-----------------------------
>>  1 files changed, 180 insertions(+), 147 deletions(-)
>
> Sorry, but I don't seem to be able to apply these patches anywhere.

There is a subtle bug in "split emit_line()" patch I sent out, but later I noticed the problem and fixed it in my tree, so please use the updated one instead from my tree.

The series applies cleanly at the tip of jc/maint-1.6.0-blank-at-eof, but the result of applying them will have large conflicts whether you are merging that into 'maint', 'master', or 'next'. It's probably easier to use the merge I've prepared to resolve them in my tree.

I have these two topics:

 - jc/maint-1.6.0-blank-at-eof forks from old 1.6.0 codebase to contain
   the above fixes (and the ones that are already in 'next'); and

 - jc/maint-blank-at-eof that forks from 1.6.4 codebase and merges the
   above branch.  This branch does not have any commit on its own, but
   does a rather nasty conflict resolution.

I'll push out the result, merging the latter to 'next' (and 'pu'), sometime in the next few hours.