mirror of
https://github.com/git/git.git
synced 2024-11-17 06:25:13 +01:00
55c4a67307
"git branch -M <foo> <current-branch>" allows updating the current branch which HEAD points, without the necessary house-keeping that git reset normally does to make this operation sensible. It also leaves the reflog in a confusing state (you would be warned when trying to read it). "git checkout -B <current branch> <foo>" is also partly vulnerable to this bug; due to inconsistent pre-flight checks it would perform half of its task and then abort just before rewriting the branch. Again this manifested itself as the index file getting out-of-sync with HEAD. "git branch -f" already guarded against this problem, and aborts with a fatal error. Update "git branch -M", "git checkout -B" and "git branch -f" to share the same check before allowing a branch to be created. These prevent you from updating the current branch. We considered suggesting the use of "git reset" in the failure message but concluded that it was not possible to discern what the user was actually trying to do. Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
39 lines
1.4 KiB
C
39 lines
1.4 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, 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.
|
|
*/
|
|
int validate_new_branchname(const char *name, struct strbuf *ref, int force);
|
|
|
|
/*
|
|
* 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);
|
|
|
|
#endif
|