Re: [PATCH 0/3] Fix assorted white space damage

From: Junio C Hamano <junkio@cox.net>
Date: May 13, 2007, 01:45 UTC
Message-ID: <7vzm49ts2f.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <e5bfff550705120409v629425aesc910927c26871323@mail.gmail.com>

"Marco Costalba" <mcostalba@gmail.com> writes:

Show 12 quoted lines

> Following there is a 3  patch series to remove stealth whitespace.
>
> I have used the new 'cleanfile' script by H. Peter Anvin, just merged
> in Linux tree.
>
> The script cleans up various classes of stealth whitespace.  In
> particular, it cleans up:
>
>  - Whitespace (spaces or tabs)before newline;
>  - DOS line endings (CR before LF);
>  - Space before tab (spaces are deleted or converted to tabs);
>  - Empty lines at end of file.

I haven't checked the script, but "git-apply --whitespace=strip" can be used to do pretty much the same job with this sequence, except the last one (do it with a copy of repository if you do not want "git clean -x" to lose untracked):

	$ git checkout master
        $ rm -f .git/index
        $ git checkout HEAD -- t/
        $ git clean -x -d
	$ git diff -R --binary HEAD >P.diff
        $ git apply --index --whitespace=strip P.diff

Then you can check the results, and make a commit.

In the above I explicitly "saved" t/ because we have some test vectors that need to have trailing whitespaces.