summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-01-12 02:13:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 20:13:04 (GMT)
commit0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763 (patch)
treec1c4b356f5b889b13c436bb4b6a6adb301c587f1 /builtin/merge.c
parent3a7a698e93e1031c322ab20c0e336e205514c058 (diff)
downloadgit-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.zip
git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.gz
git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.bz2
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>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
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 = "";