Re: [PATCH 3/3] Color support for "git-add -i"

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 6, 2007, 20:18 UTC
Message-ID: <7vejdzd1aw.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <5055E3DF-E01D-41B5-9F59-DAD69885CAE8@wincent.com>

Wincent Colaiuta <win@wincent.com> writes:

Show 11 quoted lines

> What are the other options?
>
> - Make git-add--interactive part of builtin-add so as to be able to  
> use the core.whitespace code directly? (ideally yes and at some point  
> in the future it seems inevitable that this will happen, but it will  
> require a fair bit of work)
>
> - Fork a second "git diff-files" process to capture the colorized  
> version of the output? (may set off the "kludge" alarm)
>
> - Something else?

 - Realize that whitespace clean-up can be risky and change semantics
   depending on the material you are editing.  Do not do the clean-up
   during "add -i", but before.  IOW, add an alias that does an
   equivalent of:

	git diff HEAD >tmp
        git apply -R <tmp
        git apply --whitespace=fix <tmp

   then encourage users to clean-up their whitespace gotchas early (and
   test the result!), before even attempting to run "git add -i".