X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rebase-script;h=a335b991782e56b9ce33520a4671539791ff4fb8;hb=ff3412ee1f74cc267e6d65c03c5fd8ea2214fbe7;hp=7b1d4900bd256ee8c1dd70220012be3e77070cc5;hpb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;p=git.git

diff --git a/git-rebase-script b/git-rebase-script
index 7b1d4900..a335b991 100755
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -26,8 +26,10 @@ case "$#" in
 esac
 
 upstream=`git-rev-parse --verify "$1"` &&
-ours=`git-rev-parse --verify "$ours_symbolic^` || exit
-test "$(git-diff-cache --cached "$ours")" = "" || 
+ours=`git-rev-parse --verify "$ours_symbolic"` || exit
+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 &&