git-reset <tree> -- <path> restores absense of <path> in <tree>

Junio C Hamano · Junio C Hamano · commit bc8c0294c6ab · 2007-01-06T22:57:42.000-08:00
When &lt;path&gt; exists in the index (either merged or unmerged), and
&lt;tree&gt; does not have it, git-reset should be usable to restore
the absense of it from the tree.  This implements it.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-reset.sh b/git-reset.sh
@@ -44,8 +44,10 @@ 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-diff-index --cached $rev -- "$@" |
+	sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]	\(.*\)$/\1 \2	\3/' |
+	git update-index --add --remove --index-info || exit
 	git update-index --refresh
 	exit
 fi
