diff --git a/git-reset.sh b/git-reset.sh
index 76c8a818d421c796141fae3835e1cb4726d23ef3..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."
git-diff-index --cached $rev -- "$@" |
die "Cannot do partial $reset_type reset."
git-diff-index --cached $rev -- "$@" |
exit
fi
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
}