Re: git add without whitespace
- From
- demerphq <demerphq@gmail.com>
- Date
- May 31, 2016, 16:27 UTC
- Message-ID
- <CANgJU+WZHes1-d2GXT9p+Up4e6_aA-Q5r1A8EEmCEOXjsOyuXw@mail.gmail.com>
- In-Reply-To
- <xmqqlh2r8ixu.fsf@gitster.mtv.corp.google.com>
On 30 May 2016 at 21:06, Junio C Hamano <gitster@pobox.com> wrote:
Show 22 quoted lines
> Robert Dailey <rcdailey.lists@gmail.com> writes:
>
>> $ git diff -U0 -w --no-color | git apply --cached --ignore-whitespace
>> --unidiff-zero
>>
>> This command explicitly leaves out context because it can sometimes
>> cause the patch to fail to apply, I think due to whitespace being in
>> it, but I'm not completely sure myself.
>
> I have had this in my ~/.gitconfig for a long time.
>
> [alias]
> wsadd = "!sh -c 'git diff -- \"$@\" | git apply --cached --whitespace=fix;\
> git co -- ${1-.} \"$@\"' -"
>
> That is, "take what's different from the _index_ and the working
> tree, apply that difference while correcting whitespace errors to
> the index, and check the result out to the working tree". This
> would _not_ touch existing whitespace-damaged lines that you are not
> touching, and honours the customized definition of what is
> considered whitespace breakage for each paths (which you set up with
> the attributes system).That is very very cool. I have a perl script that does the same thing from git-blame output. This is MUCH nicer.
cheers, Yves
-- perl -Mre=debug -e "/just|another|perl|hacker/"