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

Re: Segfault on merge with 1.6.2.1

From
Michael Johnson <redbeard@mdjohnson.us>
Date
Mar 30, 2009, 02:39 UTC
Message-ID
<op.urk20nanso3nzr@sulidor.mdjohnson.us>
In-Reply-To
<20090329121700.GN22446@genesis.frugalware.org>

On Sun, 29 Mar 2009 07:17:00 -0500, Miklos Vajna <vmiklos@frugalware.org> wrote:

Show 13 quoted lines
> On Sat, Mar 28, 2009 at 11:19:31AM -0500, Michael Johnson  
> <redbeard@mdjohnson.us> wrote:
>> The 1.6.2.1 version just segfaults, but 1.5.6.5 says:
>>
>> /usr/bin/git-merge: line 438: 32335 Segmentation fault
>> git-merge-$strategy $common -- "$head_arg" "$@"
>> Merge with strategy recursive failed.
>>
>> In all cases, .git/index.lock is left behind.
>
> That's because 1.6.2.1 has git-merge in C and it calls merge-recursive
> directly without a fork. Could you try it in gdb and provide a
> backtrace, please?

Well, I've got a backtrace, but I don't have debugging symbols, apparently. There is not a Debian package I can find that has them. I checked debug.debian.net, as well as the standard sid repository. So I will have to rebuild the package with debugging turned on. I will not be able to do that tonight, unfortunately. I will probably have a chance tomorrow evening.

Just in case it might be useful, though, here's the backtrace, without symbols.

Starting program: /usr/bin/git merge origin/dojo-1.3 (no debugging symbols found) ... repeated multiple times ... [Thread debugging using libthread_db enabled] (no debugging symbols found) ... repeated multiple times [New Thread 0xb7a73b30 (LWP 21505)]

Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0xb7a73b30 (LWP 21505)] 0x080e5a6f in ?? () (gdb) backtrace #0 0x080e5a6f in ?? () #1 0x0893e000 in ?? () #2 0x000f0000 in ?? () #3 0xbf949098 in ?? () #4 0x080e63ad in ?? () #5 0x08977fcf in ?? () #6 0x000f0000 in ?? () #7 0xfff0ffff in ?? () #8 0x08945dd8 in ?? () #9 0x00000000 in ?? ()

Thanks for the continuing help.
Michael
-- 
Michael D Johnson   <redbeard@mdjohnson.us>    
redbeardcreator.deviantart.com

"Marketing research...[has] shown that energy weapons that make sounds sell
  better..." - Kevin Siembieda (Rifts Game Master Guide, pg 111)
Previous: Miklos VajnaNext: Johannes Schindelin
Message 3 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.