summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-01 21:43:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-01 21:43:18 (GMT)
commit055f2c5d340508d3542ede8dc1db2aedd0b9f1b5 (patch)
tree7d33f7fc50749cb7acd5a3f25d281ffdf760e88b
parente08afecd7fe04b519b72f136c4a24b151c748f49 (diff)
parentc17b229454ac3f5d20fd0cff3a663b03c13cb38e (diff)
downloadgit-055f2c5d340508d3542ede8dc1db2aedd0b9f1b5.zip
git-055f2c5d340508d3542ede8dc1db2aedd0b9f1b5.tar.gz
git-055f2c5d340508d3542ede8dc1db2aedd0b9f1b5.tar.bz2
Merge branch 'jc/maint-1.7.3-checkout-describe' into maint
* jc/maint-1.7.3-checkout-describe: checkout -b <name>: correctly detect existing branch
-rw-r--r--builtin/checkout.c2
-rw-r--r--refs.c6
-rw-r--r--refs.h1
-rwxr-xr-xt/t2018-checkout-branch.sh11
4 files changed, 19 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 28cdc51..af1e7b5 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1071,7 +1071,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"),
diff --git a/refs.c b/refs.c
index b10419a..3a8789d 100644
--- a/refs.c
+++ b/refs.c
@@ -1826,6 +1826,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)
diff --git a/refs.h b/refs.h
index 5e7a9a5..5de06e5 100644
--- a/refs.h
+++ b/refs.h
@@ -54,6 +54,7 @@ extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refn
*/
extern void add_extra_ref(const char *refname, const unsigned char *sha1, int flags);
extern void clear_extra_refs(void);
+extern int ref_exists(char *);
extern int peel_ref(const char *, unsigned char *);
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index fa69016..a42e039 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -169,4 +169,15 @@ test_expect_success 'checkout -f -B to an existing branch with mergeable changes
test_must_fail test_dirty_mergeable
'
+test_expect_success 'checkout -b <describe>' '
+ git tag -f -m "First commit" initial initial &&
+ git checkout -f change1 &&
+ name=$(git describe) &&
+ git checkout -b $name &&
+ git diff --exit-code change1 &&
+ echo "refs/heads/$name" >expect &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expect actual
+'
+
test_done