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

Re: [PATCH] filter-branch: resolve $commit^{tree} in no-index case

From
Jeff King <peff@peff.net>
Date
Jan 20, 2016, 01:34 UTC
Message-ID
<20160120013436.GA24541@sigill.intra.peff.net>
In-Reply-To
<20160120012253.GD16090@google.com>
On Tue, Jan 19, 2016 at 05:22:53PM -0800, Jonathan Nieder wrote:
Show 10 quoted lines
> > I'm actually a little iffy on it because it switches to "diff-tree" from
> > a raw-sha1 comparison. For a well-formed repo, that shouldn't matter.
> > But what if you had a commit that was replacing a malformed tree object,
> > but not otherwise changing the diff?  We might drop it as "empty", even
> > though you'd prefer to keep it.
> 
> Mph.  We could get the best of both worlds by introducing a "git
> rev-parse --compare <a> <b>" that compares object ids.  Actually...
> 
> How about something like this?

Thanks. I had in my head that we could do something like that, but hadn't quite worked it out. I think what you wrote works.

If you want to wrap it up into a patch, I'd be OK with it, but note that it still falls afoul of changing $tree in a user-visible way (so you should note that in the commit message).

-Peff
Previous: Jonathan NiederNext: Junio C Hamano
Message 13 of 19 in “git filter-branch not removing commits when it should in 2.7.0”
  1. John FultzJan 19, 2016
  2. Junio C HamanoJan 19, 2016
  3. Junio C HamanoJan 19, 2016
  4. Jeff KingJan 19, 2016
  5. Junio C HamanoJan 19, 2016
  6. filter-branch: resolve $commit^{tree} in no-index caseJeff King, Jan 19, 2016
  7. Jeff KingJan 19, 2016
  8. Jeff KingJan 19, 2016
  9. Junio C HamanoJan 19, 2016
  10. Jeff KingJan 19, 2016
  11. Jeff KingJan 19, 2016
  12. Jonathan NiederJan 20, 2016
  13. Jeff KingJan 20, 2016
  14. Junio C HamanoJan 20, 2016
  15. Jeff KingJan 20, 2016
  16. Junio C HamanoJan 20, 2016
  17. Junio C HamanoJan 20, 2016
  18. Jeff KingJan 20, 2016
  19. Jonathan NiederJan 20, 2016

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.