2008-02-07 16:40:08 +00:00
|
|
|
#ifndef BRANCH_H
|
|
|
|
#define BRANCH_H
|
|
|
|
|
2018-11-10 05:49:00 +00:00
|
|
|
struct repository;
|
2018-08-15 17:54:05 +00:00
|
|
|
struct strbuf;
|
|
|
|
|
2018-08-15 17:54:07 +00:00
|
|
|
enum branch_track {
|
|
|
|
BRANCH_TRACK_UNSPECIFIED = -1,
|
|
|
|
BRANCH_TRACK_NEVER = 0,
|
|
|
|
BRANCH_TRACK_REMOTE,
|
|
|
|
BRANCH_TRACK_ALWAYS,
|
|
|
|
BRANCH_TRACK_EXPLICIT,
|
branch: add flags and config to inherit tracking
It can be helpful when creating a new branch to use the existing
tracking configuration from the branch point. However, there is
currently not a method to automatically do so.
Teach git-{branch,checkout,switch} an "inherit" argument to the
"--track" option. When this is set, creating a new branch will cause the
tracking configuration to default to the configuration of the branch
point, if set.
For example, if branch "main" tracks "origin/main", and we run
`git checkout --track=inherit -b feature main`, then branch "feature"
will track "origin/main". Thus, `git status` will show us how far
ahead/behind we are from origin, and `git pull` will pull from origin.
This is particularly useful when creating branches across many
submodules, such as with `git submodule foreach ...` (or if running with
a patch such as [1], which we use at $job), as it avoids having to
manually set tracking info for each submodule.
Since we've added an argument to "--track", also add "--track=direct" as
another way to explicitly get the original "--track" behavior ("--track"
without an argument still works as well).
Finally, teach branch.autoSetupMerge a new "inherit" option. When this
is set, "--track=inherit" becomes the default behavior.
[1]: https://lore.kernel.org/git/20180927221603.148025-1-sbeller@google.com/
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-21 03:30:23 +00:00
|
|
|
BRANCH_TRACK_OVERRIDE,
|
|
|
|
BRANCH_TRACK_INHERIT,
|
2018-08-15 17:54:07 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
extern enum branch_track git_branch_track;
|
|
|
|
|
2008-02-07 16:40:16 +00:00
|
|
|
/* Functions for acting on the information about branches. */
|
|
|
|
|
|
|
|
/*
|
2016-11-04 16:30:12 +00:00
|
|
|
* Creates a new branch, where:
|
|
|
|
*
|
2018-11-10 05:49:00 +00:00
|
|
|
* - r is the repository to add a branch to
|
|
|
|
*
|
2016-11-04 16:30:12 +00:00
|
|
|
* - 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
|
|
|
|
*
|
2017-11-18 17:26:45 +00:00
|
|
|
* - clobber_head_ok allows the currently checked out (hence existing)
|
|
|
|
* branch to be overwritten; without 'force', it has no effect.
|
|
|
|
*
|
2016-11-04 16:30:12 +00:00
|
|
|
* - reflog creates a reflog for the branch
|
|
|
|
*
|
2017-11-18 17:26:45 +00:00
|
|
|
* - quiet suppresses tracking information
|
|
|
|
*
|
2016-11-04 16:30:12 +00:00
|
|
|
* - track causes the new branch to be configured to merge the remote branch
|
|
|
|
* that start_name is a tracking branch for (if any).
|
2017-11-18 17:26:46 +00:00
|
|
|
*
|
2008-02-07 16:40:16 +00:00
|
|
|
*/
|
2018-11-10 05:49:00 +00:00
|
|
|
void create_branch(struct repository *r,
|
|
|
|
const char *name, const char *start_name,
|
2017-11-18 17:26:46 +00:00
|
|
|
int force, int clobber_head_ok,
|
|
|
|
int reflog, int quiet, enum branch_track track);
|
2008-02-07 16:40:08 +00:00
|
|
|
|
2011-08-20 21:49:48 +00:00
|
|
|
/*
|
2017-10-13 04:45:40 +00:00
|
|
|
* Check if 'name' can be a valid name for a branch; die otherwise.
|
|
|
|
* Return 1 if the named branch already exists; return 0 otherwise.
|
|
|
|
* Fill ref with the full refname for the branch.
|
|
|
|
*/
|
2019-04-29 08:28:14 +00:00
|
|
|
int validate_branchname(const char *name, struct strbuf *ref);
|
2017-10-13 04:45:40 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if a branch 'name' can be created as a new branch; die otherwise.
|
|
|
|
* 'force' can be used when it is OK for the named branch already exists.
|
|
|
|
* Return 1 if the named branch already exists; return 0 otherwise.
|
|
|
|
* Fill ref with the full refname for the branch.
|
2011-08-20 21:49:48 +00:00
|
|
|
*/
|
2019-04-29 08:28:14 +00:00
|
|
|
int validate_new_branchname(const char *name, struct strbuf *ref, int force);
|
2011-08-20 21:49:48 +00:00
|
|
|
|
2019-05-09 10:10:27 +00:00
|
|
|
/*
|
|
|
|
* Remove information about the merge state on the current
|
|
|
|
* branch. (E.g., MERGE_HEAD)
|
|
|
|
*/
|
|
|
|
void remove_merge_branch_state(struct repository *r);
|
|
|
|
|
2008-02-07 16:40:16 +00:00
|
|
|
/*
|
|
|
|
* Remove information about the state of working on the current
|
|
|
|
* branch. (E.g., MERGE_HEAD)
|
|
|
|
*/
|
2019-03-29 10:38:59 +00:00
|
|
|
void remove_branch_state(struct repository *r, int verbose);
|
2008-02-07 16:40:16 +00:00
|
|
|
|
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.
|
2016-02-22 11:23:23 +00:00
|
|
|
* Returns 0 on success.
|
2009-03-04 06:29:55 +00:00
|
|
|
*/
|
|
|
|
#define BRANCH_CONFIG_VERBOSE 01
|
2019-04-29 08:28:14 +00:00
|
|
|
int install_branch_config(int flag, const char *local, const char *origin, const char *remote);
|
2009-03-04 06:29:55 +00:00
|
|
|
|
2011-09-22 03:19:38 +00:00
|
|
|
/*
|
|
|
|
* Read branch description
|
|
|
|
*/
|
2019-04-29 08:28:14 +00:00
|
|
|
int read_branch_desc(struct strbuf *, const char *branch_name);
|
2011-09-22 03:19:38 +00:00
|
|
|
|
2015-07-17 23:00:04 +00:00
|
|
|
/*
|
|
|
|
* Check if a branch is checked out in the main worktree or any linked
|
|
|
|
* worktree and die (with a message describing its checkout location) if
|
|
|
|
* it is.
|
|
|
|
*/
|
2019-04-29 08:28:14 +00:00
|
|
|
void die_if_checked_out(const char *branch, int ignore_current_worktree);
|
2015-07-17 23:00:04 +00:00
|
|
|
|
2016-03-27 14:37:14 +00:00
|
|
|
/*
|
|
|
|
* Update all per-worktree HEADs pointing at the old ref to point the new ref.
|
|
|
|
* This will be used when renaming a branch. Returns 0 if successful, non-zero
|
|
|
|
* otherwise.
|
|
|
|
*/
|
2019-04-29 08:28:14 +00:00
|
|
|
int replace_each_worktree_head_symref(const char *oldref, const char *newref,
|
2019-04-29 08:28:23 +00:00
|
|
|
const char *logmsg);
|
2016-03-27 14:37:14 +00:00
|
|
|
|
2008-02-07 16:40:08 +00:00
|
|
|
#endif
|