Merge branch 'lt/logopt' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 05:44:12 +0000 (22:44 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 15 Apr 2006 05:44:12 +0000 (22:44 -0700)
* lt/logopt:
Fix up rev-list option parsing.
Fix up default abbrev in setup_revisions() argument parser.
Common option parsing for "git log --diff" and friends

1  2 
rev-list.c
diff --combined rev-list.c
index cb67b399fc560c17e1611139aeebb0a51553ecfa,0de21810c9fc1af91f6697ade2ab051b343886b9..b7aee1abb2850566e6329dd3179cee8e36085170
@@@ -365,14 -365,14 +365,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;
        track_object_refs = 0;
 +      if (bisect_list)
 +              revs.limited = 1;
  
        prepare_revision_walk(&revs);
        if (revs.tree_objects)