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

12
builtin/checkout.c
View File

@ -1072,15 +1072,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
if (opts.new_branch) {
struct strbuf buf = STRBUF_INIT;
if (strbuf_check_branch_ref(&buf, opts.new_branch))
die(_("git checkout: we do not like '%s' as a branch name."),
opts.new_branch);
if (ref_exists(buf.buf)) {
opts.branch_exists = 1;
if (!opts.new_branch_force)
die(_("git checkout: branch %s already exists"),
opts.new_branch);
}
opts.branch_exists = validate_new_branchname(opts.new_branch, &buf, !!opts.new_branch_force);
strbuf_release(&buf);
}