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

Re: Prepare "git-merge-tree" for future work

From
Junio C Hamano <junkio@cox.net>
Date
Jun 30, 2006, 02:04 UTC
Message-ID
<7vejx7mmaj.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0606281401540.12404@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> I punted on trying to use the proper git diff interfaces (they are very 
> tightly tied into the "diff_filespec" model - Junio, it might be nice if 
> there was some way to use them in a setting where that isn't necessarily 
> as natural).

I am not quite sure what you mean. You have a sets of filepairs, each of which is a pair of filespec, each of which describes the blob. And diff is about comparing them, possibly after running rename detection, pickaxe filtering and such. If the merge-tree's internal representation for each blob is more efficient or easier to use we could switch to use it as an improved implementation of filespec but I do not think that is what you meant, because I suspect that approach does not break diff from the "model". Care to elaborate a bit more please?

Previous: Linus TorvaldsNext: Linus Torvalds
Message 3 of 5 in “Prepare "git-merge-tree" for future work”
  1. Linus TorvaldsJun 28, 2006
  2. Linus TorvaldsJun 28, 2006
  3. Junio C HamanoJun 30, 2006
  4. Linus TorvaldsJun 30, 2006
  5. Junio C HamanoJun 30, 2006

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.