Bash completion support for aliases

[git.git] / git-checkout.sh

diff --git a/git-checkout.sh b/git-checkout.sh
index 5613bfc403f7a4208d2a85de73ec33229e5a3f10..dd477245fb3703402b950cbc1378b35ce379d631 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -4,8 +4,8 @@ USAGE='[-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
 SUBDIRECTORY_OK=Sometimes
 . git-sh-setup
 
-old=$(git-rev-parse HEAD)
 old_name=HEAD
+old=$(git-rev-parse --verify $old_name 2>/dev/null)
 new=
 new_name=
 force=
@@ -67,6 +67,10 @@ while [ "$#" != "0" ]; do
                        set x "$arg" "$@"
                        shift
                fi
+               case "$1" in
+               --)
+                       shift ;;
+               esac
                break
                ;;
     esac
@@ -135,6 +139,13 @@ fi
        die "git checkout: to checkout the requested commit you need to specify 
               a name for a new branch which is created and switched to"
 
+if [ "X$old" = X ]
+then
+       echo "warning: You do not appear to currently be on a branch." >&2
+       echo "warning: Forcing checkout of $new_name." >&2
+       force=1
+fi
+
 if [ "$force" ]
 then
     git-read-tree --reset -u $new