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

Merge branch 'ci/forbid-unwanted-current-branch-update'

Browse Source 
* ci/forbid-unwanted-current-branch-update:
  Show interpreted branch name in error messages
  Prevent force-updating of the current branch
This commit is contained in:
Junio C Hamano
2011-08-28 21:19:31 -07:00
parent 67c116bb26 587a9ee7da
commit 1da6d98a9a
6 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/branch.c
View File

@ -566,11 +566,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
die(_("Invalid branch name: '%s'"), oldname);
}
if (strbuf_check_branch_ref(&newref, newname))
die(_("Invalid branch name: '%s'"), newname);
if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)
die(_("A branch named '%s' already exists."), newref.buf + 11);
validate_new_branchname(newname, &newref, force);
strbuf_addf(&logmsg, "Branch: renamed %s to %s",
oldref.buf, newref.buf);