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

Re: Okay to invoke merge-recursive with an empty workdir?

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 13, 2011, 03:55 UTC
Message-ID
<7v4o0h14gv.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110913032900.GA3296@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> I'm not sure if we were ever using merge-recursive like that. Especially
> with Elijah's latest patches to handle worktree dirtiness better, I
> wouldn't be surprised if it has issues.

I am parsing the above as "seeing the need for such an extensive fix-up, it is not surprising if the base code is broken", and I have to agree.

In principle, "git merge" should be usable in an empty working tree in the sense that with correctly populated index the absense of the working tree file is _meant_ to be treated the same as having the file unchanged from the index and the HEAD version, but I suspect that "merge-recursive" is pretty much broken with that regard.

I have much more faith in "git merge -s resolve" performing correctly.
Previous: Jeff KingNext: Jeff King
Message 3 of 4 in “Okay to invoke merge-recursive with an empty workdir?”
  1. Jay SoffianSep 13, 2011
  2. Jeff KingSep 13, 2011
  3. Junio C HamanoSep 13, 2011
  4. Jeff KingSep 13, 2011

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.