On Wed, Aug 13, 2008 at 07:26:22PM +0200, Stephan Beyer <s-beyer@xxxxxxx> 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().
Attachment:
pgp4ZxymetMpO.pgp
Description: PGP signature