git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6ec9d3cb40b1e96f75132a11eb625fd42e64885d..797571f50ceac7a31a7051e4a852977a70fb55f0 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1013,7 +1013,7 @@ then
        git rev-list $revisions |
        while read rev
        do
-               if test -f "$rewritten"/$rev -a "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
+               if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
                then
                        # Use -f2 because if rev-list is telling us this commit is
                        # not worthwhile, we don't want to track its multiple heads,