Merge branch 'jk/remote-curl-squelch-extra-errors'

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index f267d8b6c3eea5c557e63814e40a9ef38b776354..7e1eda008815cca80561d6013d41479ea8c90f4a 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,