From a8055f8a8ed10a6d3272382f38a0808427ab4921 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 18 Aug 2005 16:30:36 -0700 Subject: 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 --- git-rebase-script | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-rebase-script b/git-rebase-script index 5bb3bd97af..a335b99178 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 && -- cgit v1.2.3