Merge branch 'jk/sanity'

diff --git a/branch.h b/branch.h
index 64173abf4db65b0a8e71c1c8880f97a3350306f7..58aa45fe72ca356a8bd3648782b36e63e207ee36 100644 (file)
--- 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