f9a482e62b
Like the "switched to..." message (which is already suppressed by "-q"), this message is purely informational. Let's silence it if the user asked us to be quiet. This patch is slightly more than a one-liner, because we have to teach create_branch to propagate the flag all the way down to install_branch_config. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.9 KiB
C
56 lines
1.9 KiB
C
#ifndef BRANCH_H
|
|
#define BRANCH_H
|
|
|
|
/* 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,
|
|
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
|
|
* branch. (E.g., MERGE_HEAD)
|
|
*/
|
|
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
|