aboutsummaryrefslogtreecommitdiff
path: root/worktree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-13 22:37:21 +0900
committerJunio C Hamano <gitster@pobox.com>2018-11-13 22:37:21 +0900
commit504bdc59948831ebccafb1be9f90bb58c02303eb (patch)
treefc4ec1ed62e8a2fb5807ef88b198dc581f9a7683 /worktree.c
parentdaa8282426c9b8bd28df9d8e471b5b643b826193 (diff)
parentd236f12bdeb478bbaabf056bc611c34cf9218ca8 (diff)
downloadgit-504bdc59948831ebccafb1be9f90bb58c02303eb.tar.xz
Merge branch 'nb/worktree-api-doc'
Code readability fix. * nb/worktree-api-doc: worktree: rename is_worktree_locked to worktree_lock_reason worktree: update documentation for lock_reason and lock_reason_valid
Diffstat (limited to 'worktree.c')
-rw-r--r--worktree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/worktree.c b/worktree.c
index b0d0b5426d..befdbe7fae 100644
--- 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));