From: Luben Tuikov <ltuikov@yahoo.com>
Date: Wed, 20 Dec 2006 02:18:59 GMT
Subject: Re: git-merge-recursive segmentation error
Message-ID: <427701.7195.qm@web31811.mail.mud.yahoo.com>
In-Reply-To: <Pine.LNX.4.63.0612200217300.19693@wbgn013.biozentrum.uni-wuerzburg.de>

--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
> 
> On Tue, 19 Dec 2006, Luben Tuikov wrote:
> 
> > Auto-merging init/version.c
> > /home/luben/bin/git-merge: line 394: 12030 
> > Segmentation fault git-merge-$strategy $common -- "$head_arg" "$@"
> 
> Do you have any pointers how to get the two branches you try to merge? I'd 
> be most grateful to have the sha1's of both heads, too...

The source tree is Linus' "master" tree.  The destination tree
is my own "dev" tree, which I use as an intermediate tree, before 
merging into my own kernel trees.

Hopefully with the backtrace I posted and with the big-bisect
results pointing to the culprit commit, someone can get a patch out
to fix this.

    Luben