diff options
Diffstat (limited to 'git-reset.sh')
| -rwxr-xr-x | git-reset.sh | 69 |
1 files changed, 47 insertions, 22 deletions
diff --git a/git-reset.sh b/git-reset.sh index 03d2c3b937..8d95e3748d 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -1,35 +1,60 @@ #!/bin/sh - -USAGE='[--mixed | --soft | --hard] [<commit-ish>]' +# +# Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano +# +USAGE='[--mixed | --soft | --hard] [<commit-ish>] [ [--] <paths>...]' SUBDIRECTORY_OK=Yes . git-sh-setup +update= reset_type=--mixed +unset rev + +while case $# in 0) break ;; esac +do + case "$1" in + --mixed | --soft | --hard) + reset_type="$1" + ;; + --) + break + ;; + -*) + usage + ;; + *) + rev=$(git-rev-parse --verify "$1") || exit + shift + break + ;; + esac + shift +done + +: ${rev=HEAD} +rev=$(git-rev-parse --verify $rev^0) || exit + +# Skip -- in "git reset HEAD -- foo" and "git reset -- foo". +case "$1" in --) shift ;; esac + +# git reset --mixed tree [--] paths... can be used to +# load chosen paths from the tree into the index without +# affecting the working tree nor HEAD. +if test $# != 0 +then + test "$reset_type" == "--mixed" || + die "Cannot do partial $reset_type reset." + git ls-tree -r --full-name $rev -- "$@" | + git update-index --add --index-info || exit + git update-index --refresh + exit +fi + TOP=$(git-rev-parse --show-cdup) if test ! -z "$TOP" then cd "$TOP" fi -update= -reset_type=--mixed -case "$1" in ---mixed | --soft | --hard) - reset_type="$1" - shift - ;; --*) - usage ;; -esac - -case $# in -0) rev=HEAD ;; -1) rev=$(git-rev-parse --verify "$1") || exit ;; -*) usage ;; -esac -rev=$(git-rev-parse --verify $rev^0) || exit - -# We need to remember the set of paths that _could_ be left -# behind before a hard reset, so that we can remove them. if test "$reset_type" = "--hard" then update=-u |