summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-21 23:50:05 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-21 23:50:05 -0700
commit666599d798102df2d7b32196cadb7dfb737e0b32 (patch)
tree21db458120cf33e1031f135f060d21805d3bb825 /builtin-checkout.c
parent494202524f76ac0385ae483abf970c4c9c692a77 (diff)
parent352eadc40024b141e1295693654ec20cc123844f (diff)
downloadgit-666599d798102df2d7b32196cadb7dfb737e0b32.tar.gz
Merge branch 'db/maint-checkout-b'
* db/maint-checkout-b: Check early that a new branch is new and valid
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 9377a1c71e..4497b7092d 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -580,6 +580,18 @@ no_reference:
return checkout_paths(source_tree, pathspec);
}
+ if (opts.new_branch) {
+ struct strbuf buf;
+ strbuf_init(&buf, 0);
+ strbuf_addstr(&buf, "refs/heads/");
+ strbuf_addstr(&buf, opts.new_branch);
+ if (!get_sha1(buf.buf, rev))
+ die("git checkout: branch %s already exists", opts.new_branch);
+ if (check_ref_format(buf.buf))
+ die("git checkout: we do not like '%s' as a branch name.", opts.new_branch);
+ strbuf_release(&buf);
+ }
+
if (new.name && !new.commit) {
die("Cannot switch branch to a non-commit.");
}