Skip to content

Commit b2dd021

Browse files
gitstergitster
committed
Merge branch 'jn/branch-move-to-self'
* 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"
2 parents a96a89f + 39bd6f7 commit b2dd021

File tree

6 files changed

+47
-13
lines changed

6 files changed

+47
-13
lines changed

‎branch.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,8 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
191191

192192
void create_branch(const char *head,
193193
const char *name, const char *start_name,
194-
int force, int reflog, enum branch_track track)
194+
int force, int reflog, int clobber_head,
195+
enum branch_track track)
195196
{
196197
struct ref_lock *lock = NULL;
197198
struct commit *commit;
@@ -206,7 +207,8 @@ void create_branch(const char *head,
206207
explicit_tracking = 1;
207208

208209
if (validate_new_branchname(name, &ref, force,
209-
track == BRANCH_TRACK_OVERRIDE)) {
210+
track == BRANCH_TRACK_OVERRIDE ||
211+
clobber_head)) {
210212
if (!force)
211213
dont_change_ref = 1;
212214
else

‎branch.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
* branch for (if any).
1414
*/
1515
void create_branch(const char *head, const char *name, const char *start_name,
16-
int force, int reflog, enum branch_track track);
16+
int force, int reflog,
17+
int clobber_head, enum branch_track track);
1718

1819
/*
1920
* Validates that the requested branch may be created, returning the

‎builtin/branch.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
570570
struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
571571
struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
572572
int recovery = 0;
573+
int clobber_head_ok;
573574

574575
if (!oldname)
575576
die(_("cannot rename the current branch while not on any."));
@@ -585,7 +586,13 @@ static void rename_branch(const char *oldname, const char *newname, int force)
585586
die(_("Invalid branch name: '%s'"), oldname);
586587
}
587588

588-
validate_new_branchname(newname, &newref, force, 0);
589+
/*
590+
* A command like "git branch -M currentbranch currentbranch" cannot
591+
* cause the worktree to become inconsistent with HEAD, so allow it.
592+
*/
593+
clobber_head_ok = !strcmp(oldname, newname);
594+
595+
validate_new_branchname(newname, &newref, force, clobber_head_ok);
589596

590597
strbuf_addf(&logmsg, "Branch: renamed %s to %s",
591598
oldref.buf, newref.buf);
@@ -784,7 +791,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
784791
if (kinds != REF_LOCAL_BRANCH)
785792
die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
786793
create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
787-
force_create, reflog, track);
794+
force_create, reflog, 0, track);
788795
} else
789796
usage_with_options(builtin_branch_usage, options);
790797

‎builtin/checkout.c‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,9 @@ static void update_refs_for_switch(struct checkout_opts *opts,
540540
else
541541
create_branch(old->name, opts->new_branch, new->name,
542542
opts->new_branch_force ? 1 : 0,
543-
opts->new_branch_log, opts->track);
543+
opts->new_branch_log,
544+
opts->new_branch_force ? 1 : 0,
545+
opts->track);
544546
new->name = opts->new_branch;
545547
setup_branch_path(new);
546548
}
@@ -565,8 +567,12 @@ static void update_refs_for_switch(struct checkout_opts *opts,
565567
create_symref("HEAD", new->path, msg.buf);
566568
if (!opts->quiet) {
567569
if (old->path && !strcmp(new->path, old->path)) {
568-
fprintf(stderr, _("Already on '%s'\n"),
569-
new->name);
570+
if (opts->new_branch_force)
571+
fprintf(stderr, _("Reset branch '%s'\n"),
572+
new->name);
573+
else
574+
fprintf(stderr, _("Already on '%s'\n"),
575+
new->name);
570576
} else if (opts->new_branch) {
571577
if (opts->branch_exists)
572578
fprintf(stderr, _("Switched to and reset branch '%s'\n"), new->name);
@@ -1059,7 +1065,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
10591065
struct strbuf buf = STRBUF_INIT;
10601066

10611067
opts.branch_exists = validate_new_branchname(opts.new_branch, &buf,
1062-
!!opts.new_branch_force, 0);
1068+
!!opts.new_branch_force,
1069+
!!opts.new_branch_force);
10631070

10641071
strbuf_release(&buf);
10651072
}

‎t/t2018-checkout-branch.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,13 @@ test_expect_success 'checkout -b <describe>' '
189189
test_cmp expect actual
190190
'
191191

192-
test_expect_success 'checkout -B to the current branch fails before merging' '
192+
test_expect_success 'checkout -B to the current branch works' '
193193
git checkout branch1 &&
194+
git checkout -B branch1-scratch &&
195+
194196
setup_dirty_mergeable &&
195-
git commit -mfooble &&
196-
test_must_fail git checkout -B branch1 initial &&
197-
test_must_fail test_dirty_mergeable
197+
git checkout -B branch1-scratch initial &&
198+
test_dirty_mergeable
198199
'
199200

200201
test_done

‎t/t3200-branch.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,22 @@ test_expect_success 'git branch -M baz bam should succeed when baz is checked ou
115115
git branch -M baz bam
116116
'
117117

118+
test_expect_success 'git branch -M master should work when master is checked out' '
119+
git checkout master &&
120+
git branch -M master
121+
'
122+
123+
test_expect_success 'git branch -M master master should work when master is checked out' '
124+
git checkout master &&
125+
git branch -M master master
126+
'
127+
128+
test_expect_success 'git branch -M master2 master2 should work when master is checked out' '
129+
git checkout master &&
130+
git branch master2 &&
131+
git branch -M master2 master2
132+
'
133+
118134
test_expect_success 'git branch -v -d t should work' '
119135
git branch t &&
120136
test_path_is_file .git/refs/heads/t &&

0 commit comments

Comments
 (0)