Thread (7 messages) 7 messages, 3 authors, 2016-06-15

Re: [PATCH] submodule: Demonstrate known breakage during recursive merge

flat view

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:54

Possibly related (same subject, not in this thread)

Heiko Voigt [off-list ref] 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 <redacted>
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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help