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

Re: Segfault on merge with 1.6.2.1

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Apr 1, 2009, 09:50 UTC
Message-ID
<20090401095014.GT22446@genesis.frugalware.org>
In-Reply-To
<op.uro0u0xuso3nzr@sulidor.mdjohnson.us>
On Wed, Apr 01, 2009 at 12:43:38AM -0500, Michael Johnson <redbeard@mdjohnson.us> wrote:
Show 7 quoted lines
> Anyway, I decided to try an experiment, as I had mentioned to someone that  
> if I couldn't get this bug tracked down, I'd have to do the merge  
> manually. So... I figured out the common ancestor (I used git show-branch,  
> but I'm betting there's an easier way), and merged the ancestor + 1 of the  
> other branch into my HEAD. It segfaulted. So, I tried the resolve strategy  
> at the same point. Amazingly, it worked. And a default recursive merge  
> handled the rest.

I initially replied to this thread as I wasn't sure if it's a bug in merge-recursive or builtin-merge itself. I'm not that familiar with merge-recursive, that's why I didn't reply so far. ;-)

> In short, I don't personally need a fix right now, but I can help figure  
> out what is broken with it.

If you don't need rename detection, you can merge with '-s resolve', I think that would do what you need and it avoids the problematic codepath.

Previous: Michael JohnsonNext: Clemens Buchacher
Message 8 of 18 in “Segfault on merge with 1.6.2.1”
  1. Michael JohnsonMar 28, 2009
  2. Miklos VajnaMar 29, 2009
  3. Michael JohnsonMar 30, 2009
  4. Johannes SchindelinMar 30, 2009
  5. Miklos VajnaMar 30, 2009
  6. Michael JohnsonMar 31, 2009
  7. Michael JohnsonApr 1, 2009
  8. Miklos VajnaApr 1, 2009
  9. Clemens BuchacherApr 1, 2009
  10. Michael JohnsonApr 2, 2009
  11. Clemens BuchacherApr 5, 2009
  12. 1/3 add tests for merging with submodulesClemens Buchacher, Apr 5, 2009
  13. 2/3 update cache for conflicting submodule entriesClemens Buchacher, Apr 5, 2009
  14. 3/3 simplify output of conflicting mergeClemens Buchacher, Apr 5, 2009
  15. Junio C HamanoApr 5, 2009
  16. Johannes SchindelinApr 5, 2009
  17. Michael JohnsonApr 6, 2009
  18. Clemens BuchacherApr 6, 2009

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.