[PATCH] git bugfixes and cleanups, mainly Debian things

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