Re: git add to ignore whitespaces, some day?

From: Jeff King <peff@peff.net>
Date: Mar 4, 2015, 10:05 UTC
Message-ID: <20150304100549.GA15788@peff.net>
In-Reply-To: <CAJ+F1CL_X7d3RayLmohU3tMi6w5juVFEwCEBUA_Nf-Z53bq+ew@mail.gmail.com>

On Fri, Feb 27, 2015 at 01:09:30AM +0100, Marc-André Lureau wrote:

Show 9 quoted lines

> It would be nice if git-add could be told to ignore whitespace
> changes, wouldn't it?
> 
> According to SO, I am not the one to think so:
> http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
> 
> A change to add--interactive would be as simple as adding the diff -b
> or -w option like:
> my @diff = run_cmd_pipe("git", @diff_cmd, "-w", "--", $path);

What would it mean to stage such a hunk? For example, consider this situation:

    git init

    echo 'foo();' >file
    git add file

    {
      echo 'if (something) {'
      echo '    foo();'
      echo '}'
    } >file

A regular diff shows:

    diff --git a/file b/file
    index a280f9a..ce0eeda 100644
    --- a/file
    +++ b/file
    @@ -1 +1,3 @@
    -foo();
    +if (something) {
    +    foo();
    +}

but "diff -w" would show:

    diff --git a/file b/file
    index a280f9a..ce0eeda 100644
    --- a/file
    +++ b/file
    @@ -1 +1,3 @@
    +if (something) {
         foo();
    +}

If we try to apply that hunk to what is in the index, it will not work. The context line does not exist in the index file. Even if you could convince git-apply to massage it into place, it still does not update the whitespace in the 'foo();' line. IOW, we did not stage the full hunk at all; running "git add -p" again would show that we still have the whitespace change to stage.

So if you were to pursue this, it would have to have two copies of each hunk: the one to apply, and the "display" copy that we show the user. We do this already for colorization. However, I think we rely there on the fact that the two versions of the diff match up, line for line. Whereas here, you would not even necessarily have the same number of hunks between the regular and "-b" versions.

-Peff