From: Miklos Vajna <vmiklos@frugalware.org>
Date: Wed, 13 Aug 2008 20:13:20 GMT
Subject: Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()
Message-ID: <20080813201320.GP18960@genesis.frugalware.org>
In-Reply-To: <20080813172622.GB12871@leksak.fem-net>

On Wed, Aug 13, 2008 at 07:26:22PM +0200, Stephan Beyer <s-beyer@gmx.net> wrote:
> I did not intend to replace merge_recursive() by merge_recursive_generic(),
> because merge_recursive() may be the better choice in cases where the caller
> only deals with commit objects and never with tree objects directly.
> Or if the caller does not want to lock the index or do some other stuff
> with the index...
> In that case merge_recursive_setup() is still needed, isn't it?

Hm, OK. I was not aware pure merge_recursive() will be interesting for
other builtins even after merge_recursive_generic().