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

Re: [RFH] straightening out "read-tree -m"

From
Junio C Hamano <junkio@cox.net>
Date
Mar 19, 2007, 00:04 UTC
Message-ID
<7v1wjmnlop.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<45FDC95B.5020106@midwinter.com>
Steven Grimm <koreth@midwinter.com> writes:
Show 6 quoted lines
> On my to-do list for next week is to try to come up with a minimally
> complex test case to demonstrate the problem, as the actual
> repositories in question are pretty convoluted and there were a bunch
> of other unrelated changes. I didn't mention it before now because I
> knew my description was certain to be too vague to be useful without a
> test case to look at.

You are free to come up with test case, but I have a feeling that the problem is already well understood (and that is why the last part of my RFH matters a lot more than the former "case table"). In short, "read-tree -m" (and unpack-trees) is screwy in the presense of D/F conflicts.

Previous: Steven Grimm
Message 6 of 6 in “[RFH] straightening out "read-tree -m"”
  1. Junio C HamanoMar 18, 2007
  2. Matthias LederhoferMar 18, 2007
  3. Brian GernhardtMar 18, 2007
  4. Junio C HamanoMar 18, 2007
  5. Steven GrimmMar 18, 2007
  6. Junio C HamanoMar 19, 2007

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.