From: Tom Prince <tom.prince@ualberta.net>
Date: Thu, 29 Mar 2007 14:12:30 GMT
Subject: Re: SEGV in git-merge recursive:
Message-ID: <20070329141230.GB16739@hermes>
In-Reply-To: <81b0412b0703290634j6e62ba89tce3c8c963be3fb92@mail.gmail.com>

On Thu, Mar 29, 2007 at 03:34:00PM +0200, Alex Riesen wrote:
> On 3/29/07, Tom Prince <tom.prince@ualberta.net> wrote:
> >On Thu, Mar 29, 2007 at 01:29:46PM +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.
> >> >
> >> >It does not appear to matter which direction I try to merge.
> >> >
> >>
> >> BTW, what git do you have? git --version?
> >
> >1.5.1.rc3
> >
> 
> 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.

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


-- 
  Tom