From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Aug 2011 19:04:32 GMT
Subject: Re: [PATCH/RFC] submodule: Search for merges only at end of recursive merge
Message-ID: <7vr548c7un.fsf@alter.siamese.dyndns.org>
In-Reply-To: <03300e44101092641810b34086738a151e01d8ee.1314368109.git.brad.king@kitware.com>

This is a knee-jerk reaction without thinking things thoroughly through,
but wouldn't it make more sense to do this by conditionally calling
merge_submodule() when !o->call_depth, leaving the callee oblivious to
what is in the "merge_options" structure? That way, you do not have to
touch submodule.c at all, I would think.

After all, merge_submodule() should be usable in a future merge strategy
that is different from recursive and has no notion of call_depth.