X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.sh;h=2086d26d343c59d36df79d874d65f58d6d7d8b10;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=dfa9cb8bb17f6f8694d0c639fe8b1663f9ec3c8f;hpb=c3bc895c81b6ec6906be7e6739edb4a50eecf6e9;p=git.git diff --git a/git-reset.sh b/git-reset.sh index dfa9cb8b..2086d26d 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -1,6 +1,10 @@ #!/bin/sh . git-sh-setup || die "Not a git archive" +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 )