mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/branch-move-to-self'

Browse Source 
* jn/branch-move-to-self:
  Allow checkout -B <current-branch> to update the current branch
  branch: allow a no-op "branch -M <current-branch> HEAD"
This commit is contained in:
Junio C Hamano
2011-12-13 22:53:08 -08:00
parent a96a89f715 39bd6f7261
commit b2dd021120
6 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
branch.c
View File

@ -191,7 +191,8 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
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,
enum branch_track track)
{
struct ref_lock *lock = NULL;
struct commit *commit;
@ -206,7 +207,8 @@ void create_branch(const char *head,
explicit_tracking = 1;
if (validate_new_branchname(name, &ref, force,
track == BRANCH_TRACK_OVERRIDE)) {
track == BRANCH_TRACK_OVERRIDE ||
clobber_head)) {
if (!force)
dont_change_ref = 1;
else