Beautiful, and it's in Debian/squeeze too :-) Thanks for finding the fixed version. I was just about to make a kludge in my porcelain to work around this. BR / Klas On Sat, Oct 30, 2010 at 7:26 PM, Mathias Lafeldt <misfire@xxxxxxxxxxx> wrote: > On 10/28/2010 10:16 PM, Klas Lindberg wrote: >> I haven't tried this on newer versions of git, but the release notes >> for later releases don't mention merge-tree anywhere, so... >> >> git version: 1.7.0 >> uname -a: Linux tor 2.6.32-trunk-amd64 #1 SMP Sun Jan 10 22:40:40 UTC >> 2010 x86_64 GNU/Linux >> distro: Debian GNU/Linux squeeze/sid >> >> Unpack the attached tree, cd into it and run: >> git merge-tree common master other >> >> I get the following result: >> added in local >>  our  Â100644 d68dd4031d2ad5b7a3829ad7df6635e27a7daa22 t1.txt >> Segmentation fault >> >> The exit code: >> 139 >> >> BR / Klas > > Looks like this has been fixed by 21baa6e (merge-tree: fix where two > branches share no changes, 2010-07-14). > > $ git merge-tree common master other > added in local > Âour  Â100644 d68dd4031d2ad5b7a3829ad7df6635e27a7daa22 t1.txt > > $ echo $? > 0 > > $ git --version > git version 1.7.3.2 > > -Mathias > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html