[PATCH v7 15/15] sequencer: use the "octopus" merge strategy without forking
From: Alban Gruin <hidden>
Date: 2021-03-17 20:57:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
This teaches the sequencer to invoke the "octopus" strategy with a function call instead of forking. Signed-off-by: Alban Gruin <redacted> --- sequencer.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index ec8e9bda22..683ebfc8e2 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -2054,6 +2054,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.31.0