From: Junio C Hamano <junkio@cox.net>
Date: Fri, 5 Jan 2007 09:38:56 +0000 (-0800)
Subject: git-reset <tree> -- <path> restores absense of <path> in <tree>
X-Git-Tag: v1.5.0-rc1~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc8c0294c6ab673e465a8b564e22b1b9c2a2ea50;p=git.git

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

When <path> exists in the index (either merged or unmerged), and
<tree> 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 <junkio@cox.net>
---

diff --git a/git-reset.sh b/git-reset.sh
index a9693701a..76c8a818d 100755
--- 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