git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Reverting an uncommitted revert

From
Jeff King <peff@peff.net>
Date
May 21, 2009, 03:47 UTC
Message-ID
<20090521034739.GA8091@sigill.intra.peff.net>
In-Reply-To
<alpine.LFD.2.00.0905201358000.3906@xanadu.home>
On Wed, May 20, 2009 at 02:04:58PM -0400, Nicolas Pitre wrote:
Show 6 quoted lines
> > 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
Previous: Sverre RabbelierNext: Junio C Hamano
Message 24 of 28 in “Reverting an uncommitted revert”
  1. Joshua JensenMay 20, 2009
  2. Nicolas PitreMay 20, 2009
  3. Jeff KingMay 20, 2009
  4. Nicolas PitreMay 20, 2009
  5. Jeff KingMay 20, 2009
  6. Ping YinMay 20, 2009
  7. Wincent ColaiutaMay 20, 2009
  8. Jakub NarebskiMay 20, 2009
  9. Nicolas PitreMay 20, 2009
  10. Shawn O. PearceMay 20, 2009
  11. Eric RaibleMay 20, 2009
  12. Junio C HamanoMay 20, 2009
  13. Nicolas PitreMay 20, 2009
  14. Nicolas PitreMay 20, 2009
  15. Shawn O. PearceMay 20, 2009
  16. Junio C HamanoMay 21, 2009
  17. Jakub NarebskiMay 20, 2009
  18. Wincent ColaiutaMay 20, 2009
  19. Nicolas PitreMay 20, 2009
  20. Sverre RabbelierMay 20, 2009
  21. Jeff KingMay 20, 2009
  22. Nicolas PitreMay 20, 2009
  23. Sverre RabbelierMay 20, 2009
  24. Jeff KingMay 21, 2009
  25. Junio C HamanoMay 20, 2009
  26. write-tree --ignore-cache-treeJunio C Hamano, May 20, 2009
  27. 1/2 cache-tree.c::cache_tree_find(): simplify inernal APIJunio C Hamano, May 21, 2009
  28. 2/2 Optimize "diff-index --cached" using cache-treeJunio C Hamano, May 21, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.