Merge branch 'lt/logopt' into next

* lt/logopt:
  Tentative built-in "git show"
  Built-in git-whatchanged.
  rev-list option parser fix.
  Split init_revisions() out of setup_revisions()

diff --cc git.c
index 2e0ae5e,9e29ade..239b26a
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -330,13 -327,11 +327,13 @@@ static int cmd_log_wc(int argc, const c
                        putchar(' ');
                else
                        putchar('\n');
-               pretty_print_commit(opt->commit_format, commit, ~0, buf,
-                                   LOGSIZE, wcopt->abbrev);
+               pretty_print_commit(rev->commit_format, commit, ~0, buf,
+                                   LOGSIZE, rev->abbrev);
                printf("%s\n", buf);
-               if (wcopt->do_diff) {
-                       printf("---\n");
-                       log_tree_commit(opt, commit);
 -              if (rev->diff)
++              if (rev->diff) {
++                      printf("--\n");
+                       log_tree_commit(rev, commit);
 +              }
                shown = 1;
                free(commit->buffer);
                commit->buffer = NULL;

diff --cc rev-list.c
index cb67b39,000f27a..33741eb
--- 1/rev-list.c
--- 2/rev-list.c
+++ b/rev-list.c
@@@ -365,14 -329,14 +329,16 @@@ 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;
+       save_commit_buffer = revs.verbose_header;
        track_object_refs = 0;
 +      if (bisect_list)
 +              revs.limited = 1;
  
        prepare_revision_walk(&revs);
        if (revs.tree_objects)