Subject: [PATCH v8 14/14] sequencer: use the "octopus" strategy without forking

From: Alban Gruin <[email-masked]>
Date: Tue, 9 Aug 2022 20:54:29 +0200

This teaches the sequencer to invoke the "octopus" strategy with a
function call instead of forking.

Signed-off-by: Alban Gruin <[email-masked]>
---
 sequencer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sequencer.c b/sequencer.c
index 0e5e6cbb24..00a3620584 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2319,6 +2319,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.37.1.412.gcfdce49ffd