diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-03 04:07:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-03 13:34:19 -0800 |
| commit | 3442ea4a75a3c76f65efac71b414584f765e5a99 (patch) | |
| tree | 1ba10fed9fb2ef89b102e0462579133e6d851502 /t | |
| parent | 27c03aafdf29736f889c56777426066c74fa115d (diff) | |
| download | git-3442ea4a75a3c76f65efac71b414584f765e5a99.tar.gz git-3442ea4a75a3c76f65efac71b414584f765e5a99.tar.xz | |
git checkout: do not allow switching to a tree-ish that is not a commit
"git checkout -b newbranch $commit^{tree}" mistakenly created a new branch
rooted at the current HEAD, because in that case, the two structure fields
used to see if the command was invoked without any argument (hence it
needs to default to checking out the HEAD) were populated incorrectly.
Upon seeing a command line argument that we took as a rev, we should store
that string in new.name, even if that does not name a commit. This will
correctly trigger the existing safety logic.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2011-checkout-invalid-head.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh index 764bb0a6b..15ebdc26e 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 -- |