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

Re: [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 6, 2019, 17:49 UTC
Message-ID
<xmqqsgqejiad.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<xmqq1rxykz91.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> I do agree that it is sensible to avoid doing any funky thing during
> the virtual base merges, whose result is much less observable (hence
> harder to form the right mental model in end user's head) than the
> outermost merge.  Do we want to allow this for inner merges when the
> setting is 2?  Wouldn't that hit the same BUG()?

Ah, actually no. 2 would make a choice of committing to one possible merge result and does not leave options to be resolved as conflicted, so we should be able to write out its decision as a tree. If we cannot form a tree object when operating with 2, we do have a bug and we do want to know about it.

Previous: Elijah NewrenNext: Junio C Hamano
Message 5 of 11 in “BUG() during criss-cross merge with directory rename and deleted file”
  1. Emily ShafferJul 26, 2019
  2. 1/1 merge-recursive: avoid directory rename detection in recursive caseElijah Newren, Aug 5, 2019
  3. Junio C HamanoAug 6, 2019
  4. Elijah NewrenAug 6, 2019
  5. Junio C HamanoAug 6, 2019
  6. Junio C HamanoAug 6, 2019
  7. Elijah NewrenAug 6, 2019
  8. Emily ShafferAug 6, 2019
  9. Elijah NewrenAug 6, 2019
  10. Emily ShafferAug 6, 2019
  11. Jeff KingAug 8, 2019

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.