X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.h;h=1285158dd4f26e5bbb0e0d7133055f168fee773f;hb=a31275d6ffd35bc1c269b7136f4031abe2abee70;hp=4026e3832b265c4cef6e5bc151976771867b3da9;hpb=ed36a48e6d246f4f60d44b27e8c1e660151cd0b4;p=git.git

diff --git a/branch.h b/branch.h
index 4026e3832..1285158dd 100644
--- a/branch.h
+++ b/branch.h
@@ -15,6 +15,24 @@
 void create_branch(const char *head, const char *name, const char *start_name,
 		   int force, int reflog, enum branch_track track);
 
+/*
+ * Validates that the requested branch may be created, returning the
+ * interpreted ref in ref, force indicates whether (non-head) branches
+ * may be overwritten. A non-zero return value indicates that the force
+ * parameter was non-zero and the branch already exists.
+ *
+ * Contrary to all of the above, when attr_only is 1, the caller is
+ * not interested in verifying if it is Ok to update the named
+ * branch to point at a potentially different commit. It is merely
+ * asking if it is OK to change some attribute for the named branch
+ * (e.g. tracking upstream).
+ *
+ * NEEDSWORK: This needs to be split into two separate functions in the
+ * longer run for sanity.
+ *
+ */
+int validate_new_branchname(const char *name, struct strbuf *ref, int force, int attr_only);
+
 /*
  * Remove information about the state of working on the current
  * branch. (E.g., MERGE_HEAD)