X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-reset.sh;h=5c0224090a252bed3258bbbb127e84e61a874197;hb=ce43697379ad8ffcaf061a4709489728c1dbe911;hp=0ee3e3e154a7721dc9d604fd400d2f53eaad9940;hpb=440f869d6539a2c08e50ec4ac1375645247f57fd;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index 0ee3e3e15..5c0224090 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -17,7 +17,11 @@ case "$1" in
         usage ;;
 esac
 
-rev=$(git-rev-parse --verify --default HEAD "$@") || exit
+case $# in
+0) rev=HEAD ;;
+1) rev=$(git-rev-parse --verify "$1") || exit ;;
+*) usage ;;
+esac
 rev=$(git-rev-parse --verify $rev^0) || exit
 
 # We need to remember the set of paths that _could_ be left
@@ -48,7 +52,7 @@ then
 else
 	rm -f "$GIT_DIR/ORIG_HEAD"
 fi
-git-update-ref HEAD "$rev"
+git-update-ref -m "reset $reset_type $@" HEAD "$rev"
 
 case "$reset_type" in
 --hard )
@@ -61,4 +65,4 @@ case "$reset_type" in
 	;;
 esac
 
-rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG"