diff --git a/git-rebase-script b/git-rebase-script
index 7b1d4900bd256ee8c1dd70220012be3e77070cc5..a335b991782e56b9ce33520a4671539791ff4fb8 100755 (executable)
--- a/git-rebase-script
+++ b/git-rebase-script
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 &&