Commit 3442ea4a authored by Junio C Hamano's avatar Junio C Hamano

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, even if that does not name a commit.  This will
correctly trigger the existing safety logic.
Signed-off-by: default avatarJunio C Hamano <>
Acked-by: default avatarDaniel Barkalow <>
parent 27c03aaf
......@@ -515,8 +515,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
argc--; = arg;
if ((new.commit = lookup_commit_reference_gently(rev, 1))) { = arg;
if (resolve_ref(new.path, rev, 1, NULL))
new.commit = lookup_commit_reference(rev);
......@@ -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 --
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment