diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:21 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:21 +0900 |
| commit | 504bdc59948831ebccafb1be9f90bb58c02303eb (patch) | |
| tree | fc4ec1ed62e8a2fb5807ef88b198dc581f9a7683 /worktree.h | |
| parent | daa8282426c9b8bd28df9d8e471b5b643b826193 (diff) | |
| parent | d236f12bdeb478bbaabf056bc611c34cf9218ca8 (diff) | |
| download | git-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.h')
| -rw-r--r-- | worktree.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/worktree.h b/worktree.h index df3fc30f73..55d449b6a9 100644 --- a/worktree.h +++ b/worktree.h @@ -10,12 +10,12 @@ struct worktree { char *path; char *id; char *head_ref; /* NULL if HEAD is broken or detached */ - char *lock_reason; /* internal use */ + char *lock_reason; /* private - use worktree_lock_reason */ struct object_id head_oid; int is_detached; int is_bare; int is_current; - int lock_reason_valid; + int lock_reason_valid; /* private */ }; /* Functions for acting on the information about worktrees. */ @@ -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) |