git-checkout: safety check for detached HEAD checks existing refs

Checking for reachability from refs does not help much if the
state we are currently on is somewhere in the middle.  We will
lose where we were.

So this makes sureh that HEAD is something directly pointed at
by one of the existing refs (most likely a tag for a user who
has been "sightseeing").

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-checkout.sh b/git-checkout.sh
index a309bf0a1acf07eb7a7286dccb6d9cf68b813318..dcf6ddbdf16c5c2c666aa01026912d9c425c55f2 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -171,14 +171,14 @@ then
        # Coming back...
        if test -z "$force"
        then
        # Coming back...
        if test -z "$force"
        then

-               mb=$(git merge-base --all $old $new) &&
-               case "$LF$mb$LF" in
-               *"$LF$old$LF"*) : ;;
-               *)      false ;;
-               esac || {
+               git show-ref -d -s | grep "$old" >/dev/null || {

                        echo >&2 \
                        echo >&2 \

-"You are not on a branch and switching to $new_name branch may lose
-your changes.  Use 'git checkout -f $new_name' if you want to."
+"You are not on any branch and switching to branch '$new_name'
+may lose your changes.  At this point, you can do one of two things:
+ (1) Decide it is Ok and say 'git checkout -f $new_name';
+ (2) Start a new branch from the current commit, by saying
+     'git checkout -b <branch-name>'.
+Leaving your HEAD detached; not switching to branch '$new_name'."

                        exit 1;
                }
        fi
                        exit 1;
                }
        fi