Merge branch 'maint-1.5.1' into maint

diff --git a/git-reset.sh b/git-reset.sh
index bf2a0581fe0b0dd2c393dce6f31c8e9ad9f352c9..a172d7ce25b40f192b0036d29a8a60e62649159c 100755 (executable)
--- 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.