Merge branch 'jk/config-path-include-fix'

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 4fc16166374b86927e605ccbfe341aebe0e3240f..0745e2d05330d21152f2aff720d0de338270aa6d 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -322,7 +322,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                revs.commit_format = CMIT_FMT_RAW;
 
        if ((!revs.commits &&
-            (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
+            (!(revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
              !revs.pending.nr)) ||
            revs.diff)
                usage(rev_list_usage);