Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/git-checkout.sh b/git-checkout.sh
index ed7c2c5f6aab338c844329e3ae3d9c7ce003680f..7c5ca3d62f85b78ec82f02c2045435d889c32cdd 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -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.