summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:12 (GMT)
commitb985f2aecaa6358b55d545385d0624d76ff83fb8 (patch)
treefb28f7e7a9463b659c61379fe61e0270bc7d7f08 /builtin
parent187e902dd25da5a9f48f35a48e6281faa2f8ac39 (diff)
parentc17b229454ac3f5d20fd0cff3a663b03c13cb38e (diff)
downloadgit-b985f2aecaa6358b55d545385d0624d76ff83fb8.zip
git-b985f2aecaa6358b55d545385d0624d76ff83fb8.tar.gz
git-b985f2aecaa6358b55d545385d0624d76ff83fb8.tar.bz2
Merge branch 'jc/maint-1.7.3-checkout-describe'
* jc/maint-1.7.3-checkout-describe: checkout -b <name>: correctly detect existing branch
Diffstat (limited to 'builtin')
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 015730f..f152adf 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1072,7 +1072,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
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 (!get_sha1(buf.buf, rev)) {
+ if (ref_exists(buf.buf)) {
opts.branch_exists = 1;
if (!opts.new_branch_force)
die(_("git checkout: branch %s already exists"),