From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Pitre Subject: Re: Reverting an uncommitted revert Date: Wed, 20 May 2009 08:53:51 -0400 (EDT) Message-ID: References: <4A136C40.6020808@workspacewhiz.com> <20090520032139.GB10212@coredump.intra.peff.net> <025225A0-FACC-4A29-A747-40201A7FBA19@wincent.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_rZVg3yiJcfevKWAOHbUObw)" Cc: Jeff King , Joshua Jensen , git@vger.kernel.org To: Wincent Colaiuta X-From: git-owner@vger.kernel.org Wed May 20 14:54:08 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1M6lJ9-0001rg-SO for gcvg-git-2@gmane.org; Wed, 20 May 2009 14:54:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756215AbZETMyA (ORCPT ); Wed, 20 May 2009 08:54:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755630AbZETMx7 (ORCPT ); Wed, 20 May 2009 08:53:59 -0400 Received: from relais.videotron.ca ([24.201.245.36]:52015 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753352AbZETMx6 (ORCPT ); Wed, 20 May 2009 08:53:58 -0400 Received: from xanadu.home ([66.131.194.97]) by VL-MH-MR001.ip.videotron.ca (Sun Java(tm) System Messaging Server 6.3-4.01 (built Aug 3 2007; 32bit)) with ESMTP id <0KJY006QH15RRKF1@VL-MH-MR001.ip.videotron.ca> for git@vger.kernel.org; Wed, 20 May 2009 08:53:52 -0400 (EDT) X-X-Sender: nico@xanadu.home In-reply-to: <025225A0-FACC-4A29-A747-40201A7FBA19@wincent.com> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --Boundary_(ID_rZVg3yiJcfevKWAOHbUObw) Content-type: TEXT/PLAIN; charset=ISO-8859-1 Content-transfer-encoding: 8BIT On Wed, 20 May 2009, Wincent Colaiuta wrote: > El 20/5/2009, a las 5:35, Nicolas Pitre escribió: > > > Having a "trash" reflog would solve this unambiguously. That could also > > include your index example above. 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. > > That's true in the example you provide, but it doesn't really handle Jeff's > initial example ("git add" twice on the same file), where it is possible to > throw away intermediate state (by overwriting). Did I disagree with Jeff's original example? Nicolas --Boundary_(ID_rZVg3yiJcfevKWAOHbUObw)--