From c17b229454ac3f5d20fd0cff3a663b03c13cb38e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Jun 2011 22:17:04 -0700 Subject: checkout -b : correctly detect existing branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When create a new branch, we fed "refs/heads/" 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", 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 --- refs.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'refs.c') diff --git a/refs.c b/refs.c index 6f486ae62d..92cd0d14c3 100644 --- a/refs.c +++ b/refs.c @@ -1732,6 +1732,12 @@ int update_ref(const char *action, const char *refname, return 0; } +int ref_exists(char *refname) +{ + unsigned char sha1[20]; + return !!resolve_ref(refname, sha1, 1, NULL); +} + struct ref *find_ref_by_name(const struct ref *list, const char *name) { for ( ; list; list = list->next) -- cgit v1.2.1