Re: git-merge-recursive segmentation error

Luben Tuikov· Dec 20, 2006, 02:18 UTC · lore

--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 10 quoted lines

> 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

Johannes Schindelin· Dec 20, 2006, 02:31 UTC · re: Luben Tuikov · lore

Hi,

On Tue, 19 Dec 2006, Luben Tuikov wrote:

Show 19 quoted lines

> --- 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.

Given that you have an optimized git (it even optimized orig out!), and that the commit you bisected says "Avoid accessing a slow working copy during diffcore operations." which has nothing to do at all with merge-recursive, I give up. I don't have enough information. Really.

Ciao, Dscho