X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-reset.sh;h=3133b5bd25ca7ad3c2a5451ee9c2e0f4514cd980;hb=67e78c3b8aeb44681b2d4ab2cf97145b7cc9a7a2;hp=5c0224090a252bed3258bbbb127e84e61a874197;hpb=096b1732343305b7096b1085c23eba8cd83569c7;p=git.git diff --git a/git-reset.sh b/git-reset.sh index 5c0224090..3133b5bd2 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -3,9 +3,6 @@ USAGE='[--mixed | --soft | --hard] []' . git-sh-setup -tmp=${GIT_DIR}/reset.$$ -trap 'rm -f $tmp-*' 0 1 2 3 15 - update= reset_type=--mixed case "$1" in @@ -52,7 +49,8 @@ then else rm -f "$GIT_DIR/ORIG_HEAD" fi -git-update-ref -m "reset $reset_type $@" HEAD "$rev" +git-update-ref -m "reset $reset_type $*" HEAD "$rev" +update_ref_status=$? case "$reset_type" in --hard ) @@ -66,3 +64,5 @@ case "$reset_type" in esac rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG" + +exit $update_ref_status