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

Re: [PATCH 2/3] merge-recursive: make empty tree a known object

From
Junio C Hamano <junkio@cox.net>
Date
Dec 10, 2006, 22:33 UTC
Message-ID
<7vlklf2xgd.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0612101326420.12500@woody.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 7 quoted lines
> On Sun, 10 Dec 2006, Junio C Hamano wrote:
>> 
>> That is fine by me.  We would benefit from an empty blob and an
>> empty tree.
>
> I was wondering if we ever had any special case where we wanted the empty 
> blob, and couldn't come up with any.

After saying that I was thinking about the same. Empty blob is not all that useful (and let's not bring up the "empty commit" in this discussion pretty please).

> In contrast, the empty tree clearly ends up being an interesting special 
> case that actually gets used occasionally, ie here we had two independent 
> uses for the same thing..
Two?
I sent out a patch with comment about an issue I worry about.

I do not think the empty-tree case matters in practice because we do not allow an empty tree to be committed, but if we add empty blob to the set of "well known objects", the backward compatibility issue becomes real.

Previous: Linus TorvaldsNext: Linus Torvalds
Message 9 of 37 in “Make sure the empty tree exists when needed in merge-recursive.”
  1. 1/1 Make sure the empty tree exists when needed in merge-recursive.Shawn O. Pearce, Dec 7, 2006
  2. 1/3 diff_tree_sha1(): avoid rereading trees if possibleJohannes Schindelin, Dec 9, 2006
  3. Junio C HamanoDec 10, 2006
  4. Johannes SchindelinDec 10, 2006
  5. 2/3 merge-recursive: make empty tree a known objectJohannes Schindelin, Dec 9, 2006
  6. Linus TorvaldsDec 10, 2006
  7. Junio C HamanoDec 10, 2006
  8. Linus TorvaldsDec 10, 2006
  9. Junio C HamanoDec 10, 2006
  10. Linus TorvaldsDec 10, 2006
  11. Junio C HamanoDec 10, 2006
  12. Johannes SchindelinDec 10, 2006
  13. 3/3 add test case for recursive mergeJohannes Schindelin, Dec 9, 2006
  14. Johannes SchindelinDec 10, 2006
  15. Junio C HamanoDec 10, 2006
  16. Johannes SchindelinDec 10, 2006
  17. t6024: fix timing problemJohannes Schindelin, Dec 12, 2006
  18. Junio C HamanoDec 12, 2006
  19. Johannes SchindelinDec 12, 2006
  20. merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin, Dec 13, 2006
  21. Junio C HamanoDec 13, 2006
  22. StGit repo & gitweb, was Re: [PATCH] merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin, Dec 13, 2006
  23. Jakub NarebskiDec 13, 2006
  24. Catalin MarinasDec 13, 2006
  25. Robin RosenbergDec 13, 2006
  26. Johannes SchindelinDec 13, 2006
  27. Jakub NarebskiDec 13, 2006
  28. Petr BaudisDec 19, 2006
  29. Jakub NarebskiDec 19, 2006
  30. Catalin MarinasDec 13, 2006
  31. Junio C HamanoDec 13, 2006
  32. Johannes SchindelinDec 13, 2006
  33. Catalin MarinasDec 14, 2006
  34. Shawn PearceDec 14, 2006
  35. Shawn PearceDec 14, 2006
  36. Johannes SchindelinDec 14, 2006
  37. Catalin MarinasDec 14, 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.