X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-reset.sh;h=a172d7ce25b40f192b0036d29a8a60e62649159c;hb=952c8c56380734d45bddf369fe478895672c5a3a;hp=bf2a0581fe0b0dd2c393dce6f31c8e9ad9f352c9;hpb=2aad957a519b354e248da8c76ee0d3997083dde6;p=git.git diff --git a/git-reset.sh b/git-reset.sh index bf2a0581f..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.