From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Aug 2011 19:24:22 GMT
Subject: Re: [PATCH] submodule: Demonstrate known breakage during recursive merge
Message-ID: <7vty96obo9.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110824191438.GA45292@book.hvoigt.net>

Heiko Voigt <hvoigt@hvoigt.net> writes:

> ... Its a
> little bit workaroundish so if anymore has an idea how to fix this in
> nicer way, please tell me.
>
> [1]--8<----
> From: Heiko Voigt <hvoigt@hvoigt.net>
> Subject: [PATCH] protect submodule merge search against multiple calls for
>  the same path
>
> When multiple merge-bases are found for two commits to be merged the
> merge machinery will ask twice for a merge resolution. Currently its not
> possible to use the revision-walking api for walking the same commits
> multiple times.

I have been suspecting that most of this should be done in a separate
helper program that is run via run_command() interface, without
contaminating the object pool the main merge process has with data from
the submodule object store to begin with (i.e. add_submodule_odb() and
everything below should go). Wouldn't it be a lot cleaner solution?