This teaches the sequencer to invoke the "octopus" strategy with a
function call instead of forking.
Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx>
---
sequencer.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index c4c7b28d24..34853b8970 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1927,6 +1927,9 @@ static int do_pick_commit(struct repository *r,
if (!strcmp(opts->strategy, "resolve")) {
repo_read_index(r);
res |= merge_strategies_resolve(r, common, oid_to_hex(&head), remotes);
+ } else if (!strcmp(opts->strategy, "octopus")) {
+ repo_read_index(r);
+ res |= merge_strategies_octopus(r, common, oid_to_hex(&head), remotes);
} else
res |= try_merge_command(r, opts->strategy,
opts->xopts_nr, (const char **)opts->xopts,
--
2.28.0.370.g2c2dc3cc62
