threads / discuss / 43608

git-merge-recursive segmentation error

Subject: git-merge-recursive segmentation error

## tl;dr

2 messages between Dec 20, 2006 and Dec 20, 2006.

replies: 1people: 2as markdown or json

Luben Tuikov· Dec 20, 2006, 01:00 UTC · lore

So, I'm merging Linux master into my own dev tree and here is what I get in syslog:

Dec 19 16:56:38 lion kernel: [ 1704.395478] git-merge-recur[12030] general protection rip:4285ef rsp:7ffff727bf40 error:0

and on the command line: ... Auto-merging init/Kconfig Auto-merging init/version.c /home/luben/bin/git-merge: line 394: 12030 Segmentation fault git-merge-$strategy $common -- "$head_arg" "$@" Merge with strategy recursive failed.

I'm running "next".

Are the people aware of this issue?

It is 100% reproducible on my trees.

Anyone has a patch?

     Luben

Johannes Schindelin· Dec 20, 2006, 01:18 UTC · re: Luben Tuikov · lore

Re: git-merge-recursive segmentation error

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

Ciao, Dscho