git-reset [--mixed] <tree> [--] <paths>...

Sometimes it is asked on the list how to revert selected path in
the index from a tree, most often HEAD, without affecting the
files in the working tree.  A similar operation that also
affects the working tree files has been available in the form of
"git checkout <tree> -- <paths>...".

By definition --soft would never affect either the index nor the
working tree files, and --hard is the way to make the working
tree files as close to pristine, so this new option is available
only for the default --mixed case.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-reset.sh b/git-reset.sh
index 03d2c3b9378b4a4b39c4dc5a5ec3eb4b19c2f008..8d95e3748d2cfdaa248dee385766dedde5ff4075 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,35 +1,60 @@
 #!/bin/sh
 #!/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
 
 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
 
 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
 if test "$reset_type" = "--hard"
 then
        update=-u