commit 0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763
author Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Sat Jan 12 09:13:29 2019 +0700
committer Junio C Hamano <gitster@pobox.com> Mon Jan 14 12:13:04 2019 -0800
tree c1c4b356f5b889b13c436bb4b6a6adb301c587f1
parent 3a7a698e93e1031c322ab20c0e336e205514c058

merge-recursive.c: remove implicit dependency on the_index

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index dc0b7cc..bc1aecf 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -702,7 +702,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 			return 2;
 		}
 
-		init_merge_options(&o);
+		init_merge_options(&o, the_repository);
 		if (!strcmp(strategy, "subtree"))
 			o.subtree_shift = "";