Rework cvsexportcommit to handle binary files for all cases.

diff --git a/git-checkout.sh b/git-checkout.sh
index d99688fbf2930235a01385efdd2dbc0729e660ee..dd477245fb3703402b950cbc1378b35ce379d631 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -4,11 +4,14 @@ 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=
 branch=
 newbranch=
+newbranch_log=
 merge=
 while [ "$#" != "0" ]; do
     arg="$1"
@@ -22,7 +25,10 @@ while [ "$#" != "0" ]; do
                [ -e "$GIT_DIR/refs/heads/$newbranch" ] &&
                        die "git checkout: branch $newbranch already exists"
                git-check-ref-format "heads/$newbranch" ||
-                       die "we do not like '$newbranch' as a branch name."
+                       die "git checkout: we do not like '$newbranch' as a branch name."
+               ;;
+       "-l")
+               newbranch_log=1
                ;;
        "-f")
                force=1
@@ -44,6 +50,7 @@ while [ "$#" != "0" ]; do
                                exit 1
                        fi
                        new="$rev"
+                       new_name="$arg^0"
                        if [ -f "$GIT_DIR/refs/heads/$arg" ]; then
                                branch="$arg"
                        fi
@@ -51,13 +58,19 @@ while [ "$#" != "0" ]; do
                then
                        # checking out selected paths from a tree-ish.
                        new="$rev"
+                       new_name="$arg^{tree}"
                        branch=
                else
                        new=
+                       new_name=
                        branch=
                        set x "$arg" "$@"
                        shift
                fi
+               case "$1" in
+               --)
+                       shift ;;
+               esac
                break
                ;;
     esac
@@ -75,9 +88,15 @@ done
 
 if test "$#" -ge 1
 then
+       hint=
+       if test "$#" -eq 1
+       then
+               hint="
+Did you intend to checkout '$@' which can not be resolved as commit?"
+       fi
        if test '' != "$newbranch$force$merge"
        then
-               die "updating paths and switching branches or forcing are incompatible."
+               die "git checkout: updating paths is incompatible with switching branches/forcing$hint"
        fi
        if test '' != "$new"
        then
@@ -108,7 +127,7 @@ then
        cd "$cdup"
 fi
 
-[ -z "$new" ] && new=$old
+[ -z "$new" ] && new=$old && new_name="$old_name"
 
 # If we don't have an old branch that we're switching to,
 # and we don't have a new branch name for the target we
@@ -117,12 +136,19 @@ fi
 
 [ -z "$branch$newbranch" ] &&
        [ "$new" != "$old" ] &&
-       die "git checkout: you need to specify a new branch name"
+       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 $new &&
-       git-checkout-index -q -f -u -a
+    git-read-tree --reset -u $new
 else
     git-update-index --refresh >/dev/null
     merge_error=$(git-read-tree -m -u $old $new 2>&1) || (
@@ -135,9 +161,8 @@ else
        # Match the index to the working tree, and do a three-way.
        git diff-files --name-only | git update-index --remove --stdin &&
        work=`git write-tree` &&
-       git read-tree --reset $new &&
-       git checkout-index -f -u -q -a &&
-       git read-tree -m -u $old $new $work || exit
+       git read-tree --reset -u $new &&
+       git read-tree -m -u --aggressive $old $new $work || exit
 
        if result=`git write-tree 2>/dev/null`
        then
@@ -165,7 +190,10 @@ else
        exit 0
     )
     saved_err=$?
-    git diff-files --name-status
+    if test "$saved_err" = 0
+    then
+       test "$new" = "$old" || git diff-index --name-status "$new"
+    fi
     (exit $saved_err)
 fi
 
@@ -177,9 +205,11 @@ fi
 #
 if [ "$?" -eq 0 ]; then
        if [ "$newbranch" ]; then
-               leading=`expr "refs/heads/$newbranch" : '\(.*\)/'` &&
-               mkdir -p "$GIT_DIR/$leading" &&
-               echo $new >"$GIT_DIR/refs/heads/$newbranch" || exit
+               if [ "$newbranch_log" ]; then
+                       mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$newbranch")
+                       touch "$GIT_DIR/logs/refs/heads/$newbranch"
+               fi
+               git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit
                branch="$newbranch"
        fi
        [ "$branch" ] &&