Re: git merge-tree segfault

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Oct 30, 2010, 17:25 UTC
Message-ID: <AANLkTi=mA5BUQN02r5ZUz_kHL+iC4J=4LFqe=tyCqg-q@mail.gmail.com>
In-Reply-To: <AANLkTinJQCqwRZpbO66VHrgxezedS1Ay3nr9kayiODi9@mail.gmail.com>

On Thu, Oct 28, 2010 at 20:16, Klas Lindberg <klas.lindberg@gmail.com> 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...

Doesn't segfault for me. Probably since my version has this commit:

commit 21baa6e0c56d229866c02c4b42b8b53af648d853
Author: Will Palmer <wmpalmer@gmail.com>
Date:   Wed Jul 14 18:04:07 2010 +0100

    merge-tree: fix where two branches share no changes

    15b4f7a (merge-tree: use ll_merge() not xdl_merge(), 2010-01-16)
    introduced a regression to merge-tree to cause it to segfault when merging
    files which existed in one branch, but not in the other or in the
    merge-base. This was caused by referencing entry->path at a time when
    entry was known to be possibly-NULL.

    To correct the problem, we save the path of the entry we came in with,
    as the path should be the same among all the stages no matter which
    sides are involved in the merge.

    Signed-off-by: Will Palmer <wmpalmer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

$ git tag --contains 21baa6e0c56d229866c02c4b42b8b53af648d853|grep ^v v1.7.2 v1.7.2.1 v1.7.2.2 v1.7.2.3 v1.7.2.3.msysgit.0 v1.7.3 v1.7.3-rc0 v1.7.3-rc1 v1.7.3-rc2 v1.7.3.1 v1.7.3.1.msysgit.0 v1.7.3.2 v1.7.3.2.msysgit.0