On Tue, Aug 19, 2008 at 03:00:27PM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Not exactly. builtin-merge-recursive uses get_ref() - which should not > > be in merge-recursive.c IMHO - and get_ref() uses make_virtual_commit(). > > merge_recursive() itself takes commits, so it can be only static if we > > copy it builtin-merge-recursive as well, causing a code duplication. Or > > have I missed something here? > > I think you have. > > Let's look at the call chain from cmd_merge_recursive() and think again. Thanks for the detailed answer. I just wanted to say that probably I won't have time to implement this before the weekend; but I plan to do so then.
Attachment:
pgpC4PuKcns9a.pgp
Description: PGP signature
