Re: non-empty index with git commit -a

From: Jeff King <peff@peff.net>
Date: Feb 16, 2011, 03:27 UTC
Message-ID: <20110216032715.GA1666@sigill.intra.peff.net>
In-Reply-To: <20110216032047.GA2858@elie>

On Tue, Feb 15, 2011 at 09:20:47PM -0600, Jonathan Nieder wrote:

Show 28 quoted lines

> 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

Thanks for the link, I didn't recall that discussion. I have no problem with a config option that requires an extra step, but such a safety valve should definitely be optional, since the current behavior is part of a perfectly reasonable workflow.

-Peff