repository.c: replace hold_locked_index() with repo_hold_locked_index()

[git/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index ecf8db0..8dba939 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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) {