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>
This commit is contained in:
committed by
Junio C Hamano
parent
3a7a698e93
commit
0d6caa2d08
@ -28,7 +28,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
|
||||
struct merge_options o;
|
||||
struct commit *result;
|
||||
|
||||
init_merge_options(&o);
|
||||
init_merge_options(&o, the_repository);
|
||||
if (argv[0] && ends_with(argv[0], "-subtree"))
|
||||
o.subtree_shift = "";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user