Thread (5 messages) flat view 5 messages, 2 authors, 2016-06-15

Re: What's cooking in git.git (Aug 2008, #05; Tue, 19)

From: Miklos Vajna <hidden>
Date: 2016-06-15 22:45:11

Possibly related (same subject, not in this thread)

On Tue, Aug 19, 2008 at 03:00:27PM -0700, Junio C Hamano [off-list ref] wrote:
quoted
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.

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help