OSDN Git Service

Also make git-rebase-script stricter about dirty working tree.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 23:30:36 +0000 (16:30 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 23:30:36 +0000 (16:30 -0700)
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>
git-rebase-script

index 5bb3bd9..a335b99 100755 (executable)
@@ -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 &&