diff -B: colour whitespace errors

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 124cb5846b07ee9aa72fac4cbb88098c94f5741a..59c148ff6d477c5c40258d3adc5c95f5c775ccc6 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -309,7 +309,7 @@ do_next () {
        squash|s)
                comment_for_reflog squash
 
-               has_action "$DONE" ||
+               test -f "$DONE" && has_action "$DONE" ||
                        die "Cannot 'squash' without a previous commit"
 
                mark_action_done