On Sun, 29 Mar 2009 07:17:00 -0500, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx>
wrote:
On Sat, Mar 28, 2009 at 11:19:31AM -0500, Michael Johnson
<redbeard@xxxxxxxxxxxx> 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@xxxxxxxxxxxx>
redbeardcreator.deviantart.com
"Marketing research...[has] shown that energy weapons that make sounds sell
better..." - Kevin Siembieda (Rifts Game Master Guide, pg 111)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
