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

Re: Bug in merge-recursive in virtual commit corner case

From
Junio C Hamano <junkio@cox.net>
Date
Dec 8, 2006, 06:01 UTC
Message-ID
<7vd56vorhr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20061207192401.GB12143@spearce.org>
Shawn Pearce <spearce@spearce.org> writes:
> Although Junio mentioned he recently saw something like this in
> git.git when he merged in your xdl_merge() code.  I wonder if its
> the same issue.

No, that is not related at all. My initial attempt (which is not in any commit that survives til today) used hash_sha1_file() on the result from xdl_merge() where I should have used write_sha1_file(), and I saw the same "oh, the required object is not there" errors from everywhere.

Previous: Johannes Schindelin
Message 6 of 6 in “Bug in merge-recursive in virtual commit corner case”
  1. Shawn PearceDec 7, 2006
  2. Junio C HamanoDec 7, 2006
  3. Johannes SchindelinDec 7, 2006
  4. Shawn PearceDec 7, 2006
  5. Johannes SchindelinDec 8, 2006
  6. Junio C HamanoDec 8, 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.