summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-11 23:24:42 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-11 23:24:42 -0800
commit687004b512d30daeff0e64dc718f803433d73329 (patch)
tree3f3aaaa2de75ecf63178c9b82029df598a803c9b /t
parentDocumentation/git-push.txt: minor: compress one option (diff)
parentgit checkout: do not allow switching to a tree-ish that is not a commit (diff)
downloadtgif-687004b512d30daeff0e64dc718f803433d73329.tar.xz
Merge branch 'jc/maint-do-not-switch-to-non-commit' into maint
* jc/maint-do-not-switch-to-non-commit: git checkout: do not allow switching to a tree-ish that is not a commit
Diffstat (limited to 't')
-rwxr-xr-xt/t2011-checkout-invalid-head.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index 764bb0a6bc..15ebdc26eb 100755
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -10,6 +10,10 @@ test_expect_success 'setup' '
git commit -m initial
'
+test_expect_success 'checkout should not start branch from a tree' '
+ test_must_fail git checkout -b newbranch master^{tree}
+'
+
test_expect_success 'checkout master from invalid HEAD' '
echo 0000000000000000000000000000000000000000 >.git/HEAD &&
git checkout master --