From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 16 Feb 2011 03:20:47 GMT
Subject: Re: non-empty index with git commit -a
Message-ID: <20110216032047.GA2858@elie>
In-Reply-To: <20110216023645.GA7085@sigill.intra.peff.net>

Jeff King wrote:
> On Tue, Feb 15, 2011 at 10:43:53PM +0000, Sverre Rabbelier wrote:

>> Can we please fix this?
>>
>> $ hack hack hack
>> $ git add -p # carefully add my changes
>> $ git commit -am "Add feature foo"
>> $ DAAAMN YOUUU FINGERS!!
>>
>> I remember bringing this up before, but I can't remember what the
>> discussion ended up coming to.
>
> How do you differentiate this from:
>
>   $ hack hack hack
>   $ git add -p ;# carefully add my changes
>   $ hack hack hack
>   $ git diff ;# ok, everything looks good
>   $ git commit -am "Add feature foo"
>
> ?

If I remember the discussion[1] correctly, by requiring a separate
add -u step (or commit -f -a) if the "I don't trust my fingers"
configuration is enabled.

[1] http://thread.gmane.org/gmane.linux.debian.devel.bugs.general/698001/focus=145662