Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Jun 2007 09:55:19 +0000 (02:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Jun 2007 09:55:19 +0000 (02:55 -0700)
* maint:
checkout: do not get confused with ambiguous tag/branch names

git-checkout.sh
t/t7201-co.sh
index d561c88dcbd3d5a67b4b6725e00683e613d80b9b..33f1e87c0c209b89eb785381db62d826818b602d 100755 (executable)
@@ -63,12 +63,13 @@ while [ "$#" != "0" ]; do
                                echo "unknown flag $arg"
                                exit 1
                        fi
-                       new="$rev"
                        new_name="$arg"
                        if git-show-ref --verify --quiet -- "refs/heads/$arg"
                        then
+                               rev=$(git-rev-parse --verify "refs/heads/$arg^0")
                                branch="$arg"
                        fi
+                       new="$rev"
                elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null)
                then
                        # checking out selected paths from a tree-ish.
index 5fa6a45577894e05446351fc5076a27accb1fa9f..ed2e9ee3c6fea4767f0aa288dca02825569abedf 100755 (executable)
@@ -190,4 +190,44 @@ test_expect_success 'checkout to detach HEAD with HEAD^0' '
        fi
 '
 
+test_expect_success 'checkout with ambiguous tag/branch names' '
+
+       git tag both side &&
+       git branch both master &&
+       git reset --hard &&
+       git checkout master &&
+
+       git checkout both &&
+       H=$(git rev-parse --verify HEAD) &&
+       M=$(git show-ref -s --verify refs/heads/master) &&
+       test "z$H" = "z$M" &&
+       name=$(git symbolic-ref HEAD 2>/dev/null) &&
+       test "z$name" = zrefs/heads/both
+
+'
+
+test_expect_success 'checkout with ambiguous tag/branch names' '
+
+       git reset --hard &&
+       git checkout master &&
+
+       git tag frotz side &&
+       git branch frotz master &&
+       git reset --hard &&
+       git checkout master &&
+
+       git checkout tags/frotz &&
+       H=$(git rev-parse --verify HEAD) &&
+       S=$(git show-ref -s --verify refs/heads/side) &&
+       test "z$H" = "z$S" &&
+       if name=$(git symbolic-ref HEAD 2>/dev/null)
+       then
+               echo "Bad -- should have detached"
+               false
+       else
+               : happy
+       fi
+
+'
+
 test_done