Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/git-reset.sh b/git-reset.sh
index 8d95e3748d2cfdaa248dee385766dedde5ff4075..1dc606fbd3fd29f5f4c9928a2518df46109ef449 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -5,6 +5,8 @@
 USAGE='[--mixed | --soft | --hard]  [<commit-ish>] [ [--] <paths>...]'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
+set_reflog_action "reset $*"
+require_work_tree
 
 update= reset_type=--mixed
 unset rev
@@ -22,7 +24,7 @@ do
                usage
                ;;
        *)
-               rev=$(git-rev-parse --verify "$1") || exit
+               rev=$(git rev-parse --verify "$1") || exit
                shift
                break
                ;;
@@ -31,7 +33,7 @@ do
 done
 
 : ${rev=HEAD}
-rev=$(git-rev-parse --verify $rev^0) || exit
+rev=$(git rev-parse --verify $rev^0) || exit
 
 # Skip -- in "git reset HEAD -- foo" and "git reset -- foo".
 case "$1" in --) shift ;; esac
@@ -41,19 +43,17 @@ case "$1" in --) shift ;; esac
 # affecting the working tree nor HEAD.
 if test $# != 0
 then
-       test "$reset_type" == "--mixed" ||
+       test "$reset_type" = "--mixed" ||
                die "Cannot do partial $reset_type reset."
-       git ls-tree -r --full-name $rev -- "$@" |
-       git update-index --add --index-info || exit
+
+       git diff-index --cached $rev -- "$@" |
+       sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]   \(.*\)$/\1 \2   \3/' |
+       git update-index --add --remove --index-info || exit
        git update-index --refresh
        exit
 fi
 
-TOP=$(git-rev-parse --show-cdup)
-if test ! -z "$TOP"
-then
-       cd "$TOP"
-fi
+cd_to_toplevel
 
 if test "$reset_type" = "--hard"
 then
@@ -66,32 +66,37 @@ fi
 if test "$reset_type" = "--soft"
 then
        if test -f "$GIT_DIR/MERGE_HEAD" ||
-          test "" != "$(git-ls-files --unmerged)"
+          test "" != "$(git ls-files --unmerged)"
        then
                die "Cannot do a soft reset in the middle of a merge."
        fi
 else
-       git-read-tree --reset $update "$rev" || exit
+       git read-tree -v --reset $update "$rev" || exit
 fi
 
 # Any resets update HEAD to the head being switched to.
-if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
+if orig=$(git rev-parse --verify HEAD 2>/dev/null)
 then
        echo "$orig" >"$GIT_DIR/ORIG_HEAD"
 else
        rm -f "$GIT_DIR/ORIG_HEAD"
 fi
-git-update-ref -m "reset $reset_type $*" HEAD "$rev"
+git update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
 update_ref_status=$?
 
 case "$reset_type" in
 --hard )
-       ;; # Nothing else to do
+       test $update_ref_status = 0 && {
+               printf "HEAD is now at "
+               GIT_PAGER= git log --max-count=1 --pretty=oneline \
+                       --abbrev-commit HEAD
+       }
+       ;;
 --soft )
        ;; # Nothing else to do
 --mixed )
        # Report what has not been updated.
-       git-update-index --refresh
+       git update-index --refresh
        ;;
 esac