sha1-name.c: remove implicit dependency on the_index

diff --git a/merge-recursive.c b/merge-recursive.c
index ecf8db0b716ff20305425937c26ab6b8e69d33ed..5fbd4253c1baa6a290c501112b4a4fdc55814eb1 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3576,7 +3576,7 @@ int merge_recursive(struct merge_options *o,
 
        discard_cache();
        if (!o->call_depth)
-               read_cache();
+               repo_read_index(the_repository);
 
        o->ancestor = "merged common ancestors";
        clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2),
@@ -3643,7 +3643,7 @@ int merge_recursive_generic(struct merge_options *o,
                }
        }
 
-       hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
+       repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR);
        clean = merge_recursive(o, head_commit, next_commit, ca,
                                result);
        if (clean < 0) {