summaryrefslogtreecommitdiff
path: root/t
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 /t
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
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