From: Tom Prince <tom.prince@ualberta.net>
Date: Thu, 29 Mar 2007 08:32:19 GMT
Subject: Re: SEGV in git-merge recursive:
Message-ID: <20070329083219.GA6421@hermes>
In-Reply-To: <81b0412b0703290118q3e602a7bx650ac41241855546@mail.gmail.com>

On Thu, Mar 29, 2007 at 10:18:14AM +0200, Alex Riesen wrote:
> On 3/29/07, Tom Prince <tom.prince@ualberta.net> wrote:
> >I have been keeping my Maildir in git, a non-trivial merge that causes a
> >segfault in git-merge-recursive.
> 
> Can you try and get a stack trace? Do, for example, GIT_TRACE=1 git merge 
> ...
> ... find the call to git-merge-recursive and start that in gdb.
> Wait until it crash.


Here is the backtrace.

#0  0x0000000000402d29 in sha_eq (a=0xfefefefefefefeff <Address 0xfefefefefefefeff out of bounds>,
    b=0x563cdc "�6Cq�\234�w:0T��\177�\023p\214Q,") at cache.h:259
#1  0x000000000040456e in merge (h1=0x553ca0, h2=0x553d20, branch1=0x7fff92e5c27b "HEAD",
    branch2=0x7fff92e5c3ee "merge", ca=0x5528a0, result=0x7fff92e5ab90) at merge-recursive.c:1115
#2  0x0000000000405d89 in main (argc=-1830435858, argv=0x8) at merge-recursive.c:1362

I actually got this backtrace with the following script in git-merge-gdb

#!/bin/zsh

exec gdb -x =(print run $@) =git-merge-recursive