From 75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 8 Apr 2025 15:48:39 +0000 Subject: merge, sequencer: switch recursive merges over to ort More precisely, replace calls to merge_recursive() with merge_ort_recursive(). Also change t7615 to quit calling out recursive; it is not needed anymore, and we are in fact using ort now. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- builtin/merge.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'builtin') diff --git a/builtin/merge.c b/builtin/merge.c index ba9faf126a..c0bbdab710 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -39,7 +39,6 @@ #include "rerere.h" #include "help.h" #include "merge.h" -#include "merge-recursive.h" #include "merge-ort-wrappers.h" #include "resolve-undo.h" #include "remote.h" @@ -750,12 +749,8 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR); - if (!strcmp(strategy, "ort")) - clean = merge_ort_recursive(&o, head, remoteheads->item, - reversed, &result); - else - clean = merge_recursive(&o, head, remoteheads->item, - reversed, &result); + clean = merge_ort_recursive(&o, head, remoteheads->item, + reversed, &result); free_commit_list(reversed); strbuf_release(&o.obuf); -- cgit v1.3