summaryrefslogtreecommitdiff
path: root/worktree.h
diff options
context:
space:
mode:
authorNickolai Belakovski <nbelakovski@gmail.com>2018-10-30 06:24:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-31 02:41:47 (GMT)
commitd236f12bdeb478bbaabf056bc611c34cf9218ca8 (patch)
tree0f108fa94f81fa5169cd99d76697a2949e666e2e /worktree.h
parente21cc076a31c8f6a39946f914338aa4dd6c9de3d (diff)
downloadgit-d236f12bdeb478bbaabf056bc611c34cf9218ca8.zip
git-d236f12bdeb478bbaabf056bc611c34cf9218ca8.tar.gz
git-d236f12bdeb478bbaabf056bc611c34cf9218ca8.tar.bz2
worktree: rename is_worktree_locked to worktree_lock_reason
A function prefixed with 'is_' would be expected to return a boolean, however this function returns a string. Signed-off-by: Nickolai Belakovski <nbelakovski@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'worktree.h')
-rw-r--r--worktree.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/worktree.h b/worktree.h
index 6b12a3c..55d449b 100644
--- a/worktree.h
+++ b/worktree.h
@@ -10,7 +10,7 @@ struct worktree {
char *path;
char *id;
char *head_ref; /* NULL if HEAD is broken or detached */
- char *lock_reason; /* private - use is_worktree_locked */
+ char *lock_reason; /* private - use worktree_lock_reason */
struct object_id head_oid;
int is_detached;
int is_bare;
@@ -60,7 +60,7 @@ extern int is_main_worktree(const struct worktree *wt);
* Return the reason string if the given worktree is locked or NULL
* otherwise.
*/
-extern const char *is_worktree_locked(struct worktree *wt);
+extern const char *worktree_lock_reason(struct worktree *wt);
#define WT_VALIDATE_WORKTREE_MISSING_OK (1 << 0)