X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-reset-script;h=b6476edc30b9e8f7c991ebd9e25b530ec49b8253;hb=f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda;hp=0c02aa6423ec485e19bd7439c926addbb8fd029d;hpb=3f81fc82743ccd4fd7157f1f1db41605eb018fb9;p=git.git diff --git a/git-reset-script b/git-reset-script index 0c02aa64..b6476edc 100755 --- a/git-reset-script +++ b/git-reset-script @@ -1,5 +1,7 @@ #!/bin/sh . git-sh-setup-script || die "Not a git archive" -git-read-tree --reset HEAD +rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit +rev=$(git-rev-parse --revs-only --verify $rev^0) || exit +git-read-tree --reset "$rev" && echo "$rev" > "$GIT_DIR/HEAD" git-update-cache --refresh rm -f "$GIT_DIR/MERGE_HEAD"