The interaction with unary operators and operator precedence
for && and || are better known than -a and -o, and for that
reason we prefer them. Replace all existing instances
of -a and -o to save readers from the burden of thinking
about such things.

Signed-off-by: Elia Pinto <>
--- |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ b/
index 6ec9d3c..797571f 100644
--- a/
+++ b/
@@ -1013,7 +1013,7 @@ then
        git rev-list $revisions |
        while read rev
-               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)" = ""
                        # Use -f2 because if rev-list is telling us this commit 
                        # not worthwhile, we don't want to track its multiple 

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to