From: Junio C Hamano <junkio@cox.net>
Date: Sun, 25 Sep 2005 05:52:32 +0000 (-0700)
Subject: Do not require clean tree when reverting and cherry-picking.
X-Git-Tag: v0.99.8~51
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2f5f6ef6795c880a2f13ea472b96704b4a4ca94;p=git.git

Do not require clean tree when reverting and cherry-picking.

My stupidity deserved to be yelled at by Linus ... there is no reason
to require the working tree to be clean when merging -- the only
requirements are index to match HEAD commit and the paths involved in
merge are up to date in the working tree.  Revert and cherry-pick are
just specialized forms of merge, and the requirements should be the
same.

Remove the 'general purpose routine to make sure tree is clean' from
git-sh-setup, to prevent me from getting tempted again.

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

diff --git a/git-revert.sh b/git-revert.sh
index 722c4f755..dfd914cf5 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -56,9 +56,12 @@ t)
 		die "Your index file is unmerged."
 	;;
 *)
-	check_clean_tree || die "Cannot run $me from a dirty tree."
 	head=$(git-rev-parse --verify HEAD) ||
 		die "You do not have a valid HEAD"
+	files=$(git-diff-index --cached --name-only $head) || exit
+	if [ "$files" ]; then
+		die "Dirty index: cannot $me (dirty: $files)"
+	fi
 	;;
 esac
 
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d5bfa62de..55db79584 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -17,17 +17,6 @@ die() {
 	exit 1
 }
 
-check_clean_tree() {
-    dirty1_=`git-update-index -q --refresh` && {
-    dirty2_=`git-diff-index --name-only --cached HEAD`
-    case "$dirty2_" in '') : ;; *) (exit 1) ;; esac
-    } || {
-	echo >&2 "$dirty1_"
-	echo "$dirty2_" | sed >&2 -e 's/^/modified: /'
-	(exit 1)
-    }
-}
-
 [ -h "$GIT_DIR/HEAD" ] &&
 [ -d "$GIT_DIR/refs" ] &&
 [ -d "$GIT_OBJECT_DIRECTORY/00" ]