diff --git a/git-reset.sh b/git-reset.sh
index a9693701a34dac623fcddb1943ffe326bdb05405..a172d7ce25b40f192b0036d29a8a60e62649159c 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action "reset $*"
SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action "reset $*"
+require_work_tree
update= reset_type=--mixed
unset rev
update= reset_type=--mixed
unset rev
# affecting the working tree nor HEAD.
if test $# != 0
then
# 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."
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
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
if test "$reset_type" = "--hard"
then
die "Cannot do a soft reset in the middle of a merge."
fi
else
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.
fi
# Any resets update HEAD to the head being switched to.
case "$reset_type" in
--hard )
test $update_ref_status = 0 && {
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
}
GIT_PAGER= git log --max-count=1 --pretty=oneline \
--abbrev-commit HEAD
}