Heiko Voigt <hvoigt@xxxxxxxxxx> 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@xxxxxxxxxx> > 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html