Re: Remove diff machinery dependency from read-cache

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 22, 2010, 01:01 UTC
Message-ID: <7v3a1zhrzz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <alpine.DEB.1.00.1001220158381.4985@pacific.mpi-cbg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 6 quoted lines

> On Thu, 21 Jan 2010, Junio C Hamano wrote:
>
>> By the way, do you think anybody still uses "git merge-trees"?
>
> IMO this is the only viable way to a non-broken merge-recursive.  Removing 
> it would be counterproductive.

Do you mean you don't think

    Subject: Re: git-merge segfault in 1.6.6 and master
    Date: Thu, 21 Jan 2010 16:38:56 -0800
    Message-ID: <7vaaw7j7mn.fsf@alter.siamese.dyndns.org>

    ...
    In the meantime, I think applying this patch is the right thing to do.

    -- >8 --
    Subject: merge-recursive: do not return NULL only to cause segfault

would help us?