On Mon, 30 Mar 2009 06:03:35 -0500, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx>
wrote:
On Sun, Mar 29, 2009 at 09:39:49PM -0500, Michael Johnson
<redbeard@xxxxxxxxxxxx> wrote:
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.
Okay, no rush. In case Dscho's patch does not fix your problem, please
rebuild git with debug symbols enabled and send a normal trace.
It would appear that the patch has already been applied to 1.6.2.1.
That said, here's my backtrace. I've tried tracing through to figure out
where the problem is occurring, but my gdb-foo is non-existent, I'm wating
for some GUIs to install, and I'm ready for some sleep :| So if I haven't
heard back by tomorrow evening, I'll be running one of the frontends for
gdb until I have something traced down :)
If you need any more information, please let me know.
Thanks,
Michael
(gdb) run merge origin/dojo-1.3
Starting program: /usr/bin/git merge origin/dojo-1.3
[Thread debugging using libthread_db enabled]
[New Thread 0xb7b1bb30 (LWP 2651)]
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0xb7b1bb30 (LWP 2651)]
0x080fa828 in parse_tree (item=0x0) at tree.c:250
250 if (item->object.parsed)
(gdb) backtrace
#0 0x080fa828 in parse_tree (item=0x0) at tree.c:250
#1 0x080cc40b in init_tree_desc_from_tree (desc=0xbfdf53ac, tree=0x0) at
merge-recursive.c:161
#2 0x080cc4d4 in git_merge_trees (index_only=1, common=0x8fa5df8,
head=0x0, merge=0x8fa5718) at merge-recursive.c:186
#3 0x080cf28e in merge_trees (o=0xbfdf54d0, head=0x0, merge=0x8fa5718,
common=0x8fa5df8, result=0xbfdf5448)
at merge-recursive.c:1170
#4 0x080cf75f in merge_recursive (o=0xbfdf54d0, h1=0x8ffc200,
h2=0x8f992f0, ca=0x0, result=0xbfdf548c)
at merge-recursive.c:1294
#5 0x080cf6c7 in merge_recursive (o=0xbfdf54d0, h1=0x8f99050,
h2=0x8f98ff0, ca=0x8f97b98, result=0xbfdf551c)
at merge-recursive.c:1280
#6 0x08080d75 in try_merge_strategy (strategy=0x811b9b0 "recursive",
common=0x8fd40f0, head_arg=0x811be14 "HEAD")
at builtin-merge.c:566
#7 0x08082446 in cmd_merge (argc=1, argv=0xbfdf5808, prefix=0x0) at
builtin-merge.c:1111
#8 0x0804bb5f in run_builtin (p=0x8130400, argc=2, argv=0xbfdf5808) at
git.c:244
#9 0x0804bcf3 in handle_internal_command (argc=2, argv=0xbfdf5808) at
git.c:388
#10 0x0804bdf0 in run_argv (argcp=0xbfdf5780, argv=0xbfdf5784) at git.c:434
#11 0x0804bf82 in main (argc=2, argv=0xbfdf5808) at git.c:505
--
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
