Re: Reverting an uncommitted revert

From: Jeff King <peff@peff.net>
Date: May 20, 2009, 03:38 UTC
Message-ID: <20090520033848.GA10581@coredump.intra.peff.net>
In-Reply-To: <alpine.LFD.2.00.0905192328310.3906@xanadu.home>

On Tue, May 19, 2009 at 11:35:45PM -0400, Nicolas Pitre wrote:

> Having a "trash" reflog would solve this unambiguously.  That could also 
> include your index example above.

Yeah, I think combining the two in a single log makes sense.

Show 11 quoted lines

> However, in the index case, I'd record a reflog entry only if you're
> about to discard a previously non committed entry.  If you do:
> 
> 	$ git add foo
> 	$ git add bar
> 	$ git commit
> 	$ hack hack hack
> 	$ git add foo
> 
> then in this case there is nothing to be lost hence no additional entry 
> in the "trash" reflog.

Good point. That both helps the performance and keeps the log less cluttered.

-Peff