summaryrefslogtreecommitdiff
path: root/t
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 /t
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 't')
-rwxr-xr-xt/t2018-checkout-branch.sh11
1 files changed, 11 insertions, 0 deletions
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