From: Alban Gruin Date: Mon, 05 Oct 2020 12:26:46 GMT Subject: [PATCH v3 11/11] sequencer: use the "octopus" merge strategy without forking Message-ID: <20201005122646.27994-12-alban.gruin@gmail.com> In-Reply-To: <20201005122646.27994-1-alban.gruin@gmail.com> This teaches the sequencer to invoke the "octopus" strategy with a function call instead of forking. Signed-off-by: Alban Gruin --- sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sequencer.c b/sequencer.c index ff411d54af..746afad930 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2005,6 +2005,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.662.ge304723957