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

15
builtin/checkout.c
View File

@ -540,7 +540,9 @@ static void update_refs_for_switch(struct checkout_opts *opts,
else
create_branch(old->name, opts->new_branch, new->name,
opts->new_branch_force ? 1 : 0,
opts->new_branch_log, opts->track);
opts->new_branch_log,
opts->new_branch_force ? 1 : 0,
opts->track);
new->name = opts->new_branch;
setup_branch_path(new);
}
@ -565,8 +567,12 @@ static void update_refs_for_switch(struct checkout_opts *opts,
create_symref("HEAD", new->path, msg.buf);
if (!opts->quiet) {
if (old->path && !strcmp(new->path, old->path)) {
fprintf(stderr, _("Already on '%s'\n"),
new->name);
if (opts->new_branch_force)
fprintf(stderr, _("Reset branch '%s'\n"),
new->name);
else
fprintf(stderr, _("Already on '%s'\n"),
new->name);
} else if (opts->new_branch) {
if (opts->branch_exists)
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)
struct strbuf buf = STRBUF_INIT;
opts.branch_exists = validate_new_branchname(opts.new_branch, &buf,
!!opts.new_branch_force, 0);
!!opts.new_branch_force,
!!opts.new_branch_force);
strbuf_release(&buf);
}