From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 12 Aug 2008 21:44:10 GMT
Subject: Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()
Message-ID: <20080812214410.GG18960@genesis.frugalware.org>
In-Reply-To: <1218572040-23362-1-git-send-email-s-beyer@gmx.net>

On Tue, Aug 12, 2008 at 10:13:59PM +0200, Stephan Beyer <s-beyer@gmx.net> wrote:
> merge_recursive_generic() takes, in comparison to to merge_recursive(),
> no commit ("struct commit *") arguments but SHA ids ("unsigned char *"),
> and no commit list of bases but an array of refs ("const char **").
> 
> This makes it more generic in the case that it can also take the SHA
> of a tree to merge trees without commits, for the bases, the head
> and the remote.
> 
> merge_recursive_generic() also handles locking and updating of the
> index, which is a common use case of merge_recursive().

Then what about adding an extra parameter to merge_recursive_generic()
so that merge_recursive_setup() could be a static function?

Or is there any reason to keep them separated?

Thanks.