From: Junio C Hamano <junkio@cox.net>
Date: Thu, 18 Aug 2005 23:30:36 +0000 (-0700)
Subject: Also make git-rebase-script stricter about dirty working tree.
X-Git-Tag: v0.99.5~11^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a8055f8a8ed10a6d3272382f38a0808427ab4921;p=git-core%2Fgit.git

Also make git-rebase-script stricter about dirty working tree.

Otherwise the first commit rebase makes could include whatever
dirty state the original working tree had.

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

diff --git a/git-rebase-script b/git-rebase-script
index 5bb3bd97a..a335b9917 100755
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -27,7 +27,9 @@ esac
 
 upstream=`git-rev-parse --verify "$1"` &&
 ours=`git-rev-parse --verify "$ours_symbolic"` || exit
-test "$(git-diff-cache --cached "$ours")" = "" || 
+different1=$(git-diff-cache --name-only --cached "$ours") &&
+different2=$(git-diff-cache --name-only "$ours") &&
+test "$different1$different2" = "" ||
 die "Your working tree does not match $ours_symbolic."
 
 git-read-tree -m -u $ours $upstream &&