X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-reset.sh;h=eb44ee8cc197b7ff11159cf046b790cf693d3a72;hb=724b511d4fb363ebee828ba3992c831ba006444c;hp=dfa9cb8bb17f6f8694d0c639fe8b1663f9ec3c8f;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git diff --git a/git-reset.sh b/git-reset.sh index dfa9cb8b..eb44ee8c 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -1,5 +1,7 @@ #!/bin/sh -. git-sh-setup || die "Not a git archive" + +USAGE='[--mixed | --soft | --hard] []' +. git-sh-setup tmp=/var/tmp/reset.$$ trap 'rm -f $tmp-*' 0 1 2 3 15 @@ -10,6 +12,8 @@ case "$1" in reset_type="$1" shift ;; +-*) + usage ;; esac rev=$(git-rev-parse --verify --default HEAD "$@") || exit @@ -60,7 +64,7 @@ then else rm -f "$GIT_DIR/ORIG_HEAD" fi -echo "$rev" >"$GIT_DIR/HEAD" +git-update-ref HEAD "$rev" case "$reset_type" in --hard )