From: Jeff King <peff@peff.net>
To: Nicolas Pitre <nico@cam.org>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
Git List <git@vger.kernel.org>,
Wincent Colaiuta <win@wincent.com>,
Joshua Jensen <jjensen@workspacewhiz.com>
Subject: Re: Reverting an uncommitted revert
Date: Wed, 20 May 2009 23:47:40 -0400 [thread overview]
Message-ID: <20090521034739.GA8091@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.LFD.2.00.0905201358000.3906@xanadu.home>
On Wed, May 20, 2009 at 02:04:58PM -0400, Nicolas Pitre wrote:
> > I was envisioning a reflog of tree objects, so you could do:
> [...]
> Even simpler (for the user) would be to create a full commit with a
> synthetic message. The advantage is that the commit would have for
> parent the HEAD commit at the moment the operation leading to the reflog
> entry was made, with the date tag, etc. The message could even contain
I think you are right that this is better. I was trying to save the
creation of an extra commit object, but it probably is not that big a
deal (as Junio mentioned, we may already be creating multiple tree
objects). And having parent information is much richer for doing actual
merges of the changes introduced by that reflog commit, not just pulling
out individual pieces of its state.
So forget my idea of storing trees; it should definitely be commits.
-Peff
next prev parent reply other threads:[~2009-05-21 3:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-20 2:34 Reverting an uncommitted revert Joshua Jensen
2009-05-20 3:10 ` Nicolas Pitre
2009-05-20 3:21 ` Jeff King
2009-05-20 3:35 ` Nicolas Pitre
2009-05-20 3:38 ` Jeff King
2009-05-20 4:58 ` Ping Yin
2009-05-20 9:15 ` Wincent Colaiuta
2009-05-20 10:16 ` Jakub Narebski
2009-05-20 12:53 ` Nicolas Pitre
2009-05-20 14:17 ` Shawn O. Pearce
2009-05-20 16:55 ` Eric Raible
2009-05-20 17:59 ` Junio C Hamano
2009-05-20 18:19 ` Nicolas Pitre
2009-05-20 18:25 ` Nicolas Pitre
2009-05-20 18:57 ` Shawn O. Pearce
2009-05-21 6:16 ` Junio C Hamano
2009-05-20 18:21 ` Jakub Narebski
2009-05-20 15:23 ` Wincent Colaiuta
2009-05-20 15:47 ` Nicolas Pitre
2009-05-20 16:13 ` Sverre Rabbelier
2009-05-20 16:58 ` Jeff King
2009-05-20 18:04 ` Nicolas Pitre
2009-05-20 18:08 ` Sverre Rabbelier
2009-05-21 3:47 ` Jeff King [this message]
2009-05-20 17:50 ` Junio C Hamano
2009-05-20 18:27 ` [PATCH] write-tree --ignore-cache-tree Junio C Hamano
2009-05-21 0:40 ` [PATCH 1/2] cache-tree.c::cache_tree_find(): simplify inernal API Junio C Hamano
2009-05-21 0:44 ` [PATCH 2/2] Optimize "diff-index --cached" using cache-tree Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090521034739.GA8091@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jjensen@workspacewhiz.com \
--cc=nico@cam.org \
--cc=srabbelier@gmail.com \
--cc=win@wincent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).