Merge branch 'jc/logopt' into next

* jc/logopt:
Revert all the rev-list option parsing changes.

diff --combined rev-list.c
index b7aee1abb2850566e6329dd3179cee8e36085170,963707a495092405c3eb5b155c195b2968afdac7..cb67b399fc560c17e1611139aeebb0a51553ecfa
--- 1/rev-list.c
--- 2/rev-list.c
+++ b/rev-list.c
@@@ -365,16 -365,12 +365,14 @@@ int main(int argc, const char **argv
  
        list = revs.commits;
  
-       if ((!list &&
-            (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&
-             !revs.pending_objects)) ||
-           revs.diff)
+       if (!list &&
+           (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
                usage(rev_list_usage);
  
        save_commit_buffer = verbose_header;
        track_object_refs = 0;
 +      if (bisect_list)
 +              revs.limited = 1;
  
        prepare_revision_walk(&revs);
        if (revs.tree_objects)