Merge branch 'lt/logopt' into next

diff --git a/rev-list.c b/rev-list.c
index cb67b399fc560c17e1611139aeebb0a51553ecfa..b7aee1abb2850566e6329dd3179cee8e36085170 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -365,8 +365,10 @@ int main(int argc, const char **argv)
 
        list = revs.commits;
 
-       if (!list &&
-           (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
+       if ((!list &&
+            (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
+             !revs.pending_objects)) ||
+           revs.diff)
                usage(rev_list_usage);
 
        save_commit_buffer = verbose_header;