Merge branch 'ao/submodule-wo-gitmodules-checked-out'

[thirdparty/git.git] / worktree.c

diff --git a/worktree.c b/worktree.c
index b0d0b5426da0d1cbe8d7b6ff569c7511569cf0a3..befdbe7faef37d8ae1d4a3de896e37fade2f4862 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -235,7 +235,7 @@ int is_main_worktree(const struct worktree *wt)
        return !wt->id;
 }
 
-const char *is_worktree_locked(struct worktree *wt)
+const char *worktree_lock_reason(struct worktree *wt)
 {
        assert(!is_main_worktree(wt));