X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.sh;h=72ef303aedc69a1d9cdd946a91059638cb2e550a;hb=3e9fabc85ef44fa0f275dd89738a2dacb7b6f5db;hp=dfa9cb8bb17f6f8694d0c639fe8b1663f9ec3c8f;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;p=git.git diff --git a/git-reset.sh b/git-reset.sh index dfa9cb8b..72ef303a 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -1,5 +1,9 @@ #!/bin/sh -. git-sh-setup || die "Not a git archive" +. git-sh-setup + +usage () { + die 'Usage: git reset [--mixed | --soft | --hard] []' +} tmp=/var/tmp/reset.$$ trap 'rm -f $tmp-*' 0 1 2 3 15 @@ -10,6 +14,8 @@ case "$1" in reset_type="$1" shift ;; +-*) + usage ;; esac rev=$(git-rev-parse --verify --default HEAD "$@") || exit @@ -60,7 +66,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 )