Re: SEGV in git-merge recursive:

From: Alex Riesen <raa.lkml@gmail.com>
Date: Mar 29, 2007, 14:44 UTC
Message-ID: <81b0412b0703290744h34b6ef01s4e6f90b1d7ed231b@mail.gmail.com>
In-Reply-To: <20070329141230.GB16739@hermes>

On 3/29/07, Tom Prince <tom.prince@ualberta.net> wrote:

Show 12 quoted lines

> > Did it crash before? If it didn't, is it possible for you to bisect
> > the commit which caused the problem?
>
> It occurs running
>
> git merge -s recur test HEAD merge
>
> with
>
> 6c711269d4e49072703255ce29bd4d8c53e4f4ba
>
> which introduced the C version of merge-recursive.

So, it _always_ crashed for you.

Show 15 quoted lines

> Here is the output from that more verbose version:
>
> Merging HEAD with 0134d595adb023841750f1ce84ecb94dd4e4c9cb
> Merging:
> 922ee6e3f1222c8e171e6ea0b6ac0f28fb1f0683 Mail.
> 0134d595adb023841750f1ce84ecb94dd4e4c9cb Mail.
> found 2 common ancestor(s):
> 29e722de58df3cd82600fa5215ec26f80a8c0f9a Mail.
> 2c3490d82610d12d8dfde36b29c4ec5a50955b89 Mail.
>   Merging:
>   29e722de58df3cd82600fa5215ec26f80a8c0f9a Mail.
>   2c3490d82610d12d8dfde36b29c4ec5a50955b89 Mail.
>   found 1 common ancestor(s):
>   e2123cfd9a53e441c7c715627953606c6093e0e4 Merge commit 'origin'
>   CONFLICT (rename/rename): Rename .drafts/new/1175001142.P509Q1.hermes->.mom/cur/1175098106.P18146Q0M209985.socrates:2,S in branch Temporary merge branch 1 rename .drafts/new/1175001142.P509Q1.hermes->.drafts/cur/1175001142.P509Q1.hermes:2, in Temporary merge branch 2

Rename conflict... Will see, if I can reproduce it without your repo. In the mean time, how about

> /Users/cougar/local/bin/git-merge: line 311: 25426 Segmentation fault      git-merge-$strategy $common -- "$head_arg" "$@"
> No merge strategy handled the merge.

Is it MacOSX, by any chance? On 64bit? just collating data