X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-reset.sh;h=a172d7ce25b40f192b0036d29a8a60e62649159c;hb=240ba7f235c9b946678bd6d34826fb73ea8fd90e;hp=91c7e6e664eeac0a130044d3d026ccbbfa00f3b3;hpb=67583917e9a2a85605c1123a62c8883593e7e889;p=git.git diff --git a/git-reset.sh b/git-reset.sh index 91c7e6e66..a172d7ce2 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -43,7 +43,7 @@ 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-diff-index --cached $rev -- "$@" | @@ -71,7 +71,7 @@ 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. @@ -87,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 }