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

Re: bug in merge

From
Jeff King <peff@peff.net>
Date
Jun 5, 2012, 05:23 UTC
Message-ID
<20120605052312.GA16958@sigill.intra.peff.net>
In-Reply-To
<4FCCE306.9020600@corp.hrsmart.com>
On Mon, Jun 04, 2012 at 11:32:06AM -0500, Kevin Brannen wrote:
Show 8 quoted lines
> I believe I've just found a bug in "merge", specifically in the
> "recursive" strategy. (Or really, here's another example of and
> hopefully more info on a known bug.) Oh, this is with 1.7.2.3, the
> latest I'm able to use on this machine.
> [...]
> So I think the problem is just too many renames/moves of the same
> object and when "recursive" descends the tree, it just can't handle
> that correctly -- or that's my guess. :)

There were a large number of merge-recursive corner cases fixed, especially around renames, in the 1.7.3, 1.7.4, and 1.7.7 versions of git. I do not recall specially a bug that matches your description, but I would not be surprised at all if was already fixed by existing changes.

Can you try to reproduce with a more recent version of git (preferably the current "master" branch)?

-Peff
Previous: Kevin Brannen
Message 2 of 2 in “bug in merge”
  1. Kevin BrannenJun 4, 2012
  2. Jeff KingJun 5, 2012

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.