diff options
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index ca855d716c..ddefec053e 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1071,15 +1071,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); } |