diff options
Diffstat (limited to 'branch.h')
| -rw-r--r-- | branch.h | 33 |
1 files changed, 32 insertions, 1 deletions
@@ -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, int quiet, 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 @@ -21,4 +40,16 @@ void create_branch(const char *head, const char *name, const char *start_name, */ void remove_branch_state(void); +/* + * Configure local branch "local" as downstream to branch "remote" + * from remote "origin". Used by git branch --set-upstream. + */ +#define BRANCH_CONFIG_VERBOSE 01 +extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote); + +/* + * Read branch description + */ +extern int read_branch_desc(struct strbuf *, const char *branch_name); + #endif |