2008-02-07 16:40:08 +00:00
|
|
|
#ifndef BRANCH_H
|
|
|
|
#define BRANCH_H
|
|
|
|
|
2008-02-07 16:40:16 +00:00
|
|
|
/* Functions for acting on the information about branches. */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Creates a new branch, where head is the branch currently checked
|
|
|
|
* out, name is the new branch name, start_name is the name of the
|
|
|
|
* existing branch that the new branch should start from, force
|
|
|
|
* enables overwriting an existing (non-head) branch, reflog creates a
|
|
|
|
* reflog for the branch, and track causes the new branch to be
|
|
|
|
* configured to merge the remote branch that start_name is a tracking
|
|
|
|
* branch for (if any).
|
|
|
|
*/
|
|
|
|
void create_branch(const char *head, const char *name, const char *start_name,
|
2011-11-26 08:54:55 +00:00
|
|
|
int force, int reflog,
|
2012-03-26 23:51:01 +00:00
|
|
|
int clobber_head, int quiet, enum branch_track track);
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2011-08-20 21:49:48 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
2011-09-16 23:28:38 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
2011-08-20 21:49:48 +00:00
|
|
|
*/
|
2011-09-16 23:28:38 +00:00
|
|
|
int validate_new_branchname(const char *name, struct strbuf *ref, int force, int attr_only);
|
2011-08-20 21:49:48 +00:00
|
|
|
|
2008-02-07 16:40:16 +00:00
|
|
|
/*
|
|
|
|
* Remove information about the state of working on the current
|
|
|
|
* branch. (E.g., MERGE_HEAD)
|
|
|
|
*/
|
|
|
|
void remove_branch_state(void);
|
|
|
|
|
2009-03-04 06:29:55 +00:00
|
|
|
/*
|
2010-11-02 15:31:25 +00:00
|
|
|
* Configure local branch "local" as downstream to branch "remote"
|
|
|
|
* from remote "origin". Used by git branch --set-upstream.
|
2009-03-04 06:29:55 +00:00
|
|
|
*/
|
|
|
|
#define BRANCH_CONFIG_VERBOSE 01
|
|
|
|
extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);
|
|
|
|
|
2011-09-22 03:19:38 +00:00
|
|
|
/*
|
|
|
|
* Read branch description
|
|
|
|
*/
|
|
|
|
extern int read_branch_desc(struct strbuf *, const char *branch_name);
|
|
|
|
|
2008-02-07 16:40:08 +00:00
|
|
|
#endif
|