git-grep: don't use sscanf

[git.git] / git-reset.sh

diff --git a/git-reset.sh b/git-reset.sh
index a9693701a34dac623fcddb1943ffe326bdb05405..fee6d98d9cba708828c36a2d2a29dbec8662c36b 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -6,6 +6,7 @@ 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
@@ -42,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
@@ -88,7 +87,7 @@ update_ref_status=$?
 case "$reset_type" in
 --hard )
        test $update_ref_status = 0 && {
-               echo -n "HEAD is now at "
+               printf "HEAD is now at "
                GIT_PAGER= git log --max-count=1 --pretty=oneline \
                        --abbrev-commit HEAD
        }