diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-05 22:17:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-05 22:17:04 -0700 |
| commit | c17b229454ac3f5d20fd0cff3a663b03c13cb38e (patch) | |
| tree | f6b58684601a2da3bc6cf802ce764f072dd5c932 /builtin/checkout.c | |
| parent | 02ac98374eefbe4a46d4b53a8a78057ad8ad39b7 (diff) | |
| download | git-c17b229454ac3f5d20fd0cff3a663b03c13cb38e.tar.gz git-c17b229454ac3f5d20fd0cff3a663b03c13cb38e.tar.xz | |
checkout -b <name>: correctly detect existing branch
When create a new branch, we fed "refs/heads/<proposed name>" as a string
to get_sha1() and expected it to fail when a branch already exists.
The right way to check if a ref exists is to check with resolve_ref().
A naïve solution that might appear attractive but does not work is to
forbid slashes in get_describe_name() but that will not work. A describe
name is is in the form of "ANYTHING-g<short sha1>", and that ANYTHING part
comes from a original tag name used in the repository the user ran the
describe command. A sick user could have a confusing hierarchical tag
whose name is "refs/heads/foobar" (stored as refs/tags/refs/heads/foobar")
to generate a describe name "refs/heads/foobar-6-g02ac983", and we should
be able to use that name to refer to the object whose name is 02ac983.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 4ad74270c..88708d48b 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -874,7 +874,7 @@ no_reference: 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", |