From ed89f84b3c05d6359aba842e245910c996d91859 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Fri, 17 Jul 2015 19:00:04 -0400 Subject: branch: publish die_if_checked_out() git-worktree currently conflates new branch creation, setting of HEAD in the new wortkree, and worktree population into a single sub-invocation of git-checkout. However, these operations will eventually be separated, and git-worktree itself will need to be able to detect if the branch is already checked out elsewhere, rather than relying upon git-branch to make this determination, so publish die_if_checked_out(). Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- branch.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'branch.h') diff --git a/branch.h b/branch.h index 64173abf4d..58aa45fe72 100644 --- a/branch.h +++ b/branch.h @@ -52,4 +52,11 @@ extern void install_branch_config(int flag, const char *local, const char *origi */ extern int read_branch_desc(struct strbuf *, const char *branch_name); +/* + * Check if a branch is checked out in the main worktree or any linked + * worktree and die (with a message describing its checkout location) if + * it is. + */ +extern void die_if_checked_out(const char *branch); + #endif -- cgit v1.2.3