[PATCH 18/25] worktree.c: add is_worktree_locked()
flat view
STALE3767d
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-16 02:18:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v1 of 2 in this series.
Revisions (2)
- v2 [diff vs current]
- v1 current
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- worktree.c | 18 ++++++++++++++++++ worktree.h | 6 ++++++ 2 files changed, 24 insertions(+)
diff --git a/worktree.c b/worktree.c
index e526e25..37eec09 100644
--- a/worktree.c
+++ b/worktree.c@@ -219,6 +219,24 @@ int is_main_worktree(const struct worktree *wt) return wt && !wt->id; } +const char *is_worktree_locked(const struct worktree *wt) +{ + static struct strbuf sb = STRBUF_INIT; + + if (!file_exists(git_common_path("worktrees/%s/locked", wt->id))) + return NULL; + + strbuf_reset(&sb); + if (strbuf_read_file(&sb, + git_common_path("worktrees/%s/locked", wt->id), + 0) < 0) + die_errno(_("failed to read '%s'"), + git_common_path("worktrees/%s/locked", wt->id)); + + strbuf_rtrim(&sb); + return sb.buf; +} + static int report(int quiet, const char *fmt, ...) { va_list params;
diff --git a/worktree.h b/worktree.h
index bbe40ef..cbd5389 100644
--- a/worktree.h
+++ b/worktree.h@@ -39,6 +39,12 @@ extern struct worktree *find_worktree_by_path(struct worktree **list, extern int is_main_worktree(const struct worktree *wt); /* + * Return the reason string if the given worktree is locked. Return + * NULL otherwise. + */ +extern const char *is_worktree_locked(const struct worktree *wt); + +/* * Return zero if the worktree is in good condition. */ extern int validate_worktree(const struct worktree *wt, int quiet);
--
2.8.0.rc0.210.gd302cd2