Merge branch 'jt/submodule-tests-cleanup'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 7d8bcc3833512bc262bd0a8d86db9169d991b320..3faae382de4fa345f6d54c9120d33ed86c02e2cc 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1287,11 +1287,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
        if (opts.new_branch) {
                struct strbuf buf = STRBUF_INIT;
 
-               opts.branch_exists =
-                       validate_new_branchname(opts.new_branch, &buf,
-                                               !!opts.new_branch_force,
-                                               !!opts.new_branch_force);
-
+               if (opts.new_branch_force)
+                       opts.branch_exists = validate_branchname(opts.new_branch, &buf);
+               else
+                       opts.branch_exists =
+                               validate_new_branchname(opts.new_branch, &buf, 0);
                strbuf_release(&buf);
        }