X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.h;h=e125ff4ca89a87fadb03b3d8272b44ab33640c72;hb=5f4d133fca7eb3cb750f056a6fd0281ba06cd12f;hp=4026e3832b265c4cef6e5bc151976771867b3da9;hpb=43176d1e4cddc4ab2f2f7dc6f3ba10513ffc2f2b;p=git.git

diff --git a/branch.h b/branch.h
index 4026e3832..e125ff4ca 100644
--- a/branch.h
+++ b/branch.h
@@ -13,7 +13,26 @@
  * branch for (if any).
  */
 void create_branch(const char *head, const char *name, const char *start_name,
-		   int force, int reflog, enum branch_track track);
+		   int force, int reflog,
+		   int clobber_head, 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