From: Junio C Hamano <junkio@cox.net>
Date: Sat, 15 Apr 2006 05:44:12 +0000 (-0700)
Subject: Merge branch 'lt/logopt' into next
X-Git-Tag: v1.4.1-rc1~224
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/300dd93306f4b2281cc05ab2ac809009c99cd713?hp=-c

Merge branch 'lt/logopt' into next

* 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
---

300dd93306f4b2281cc05ab2ac809009c99cd713
diff --combined rev-list.c
index cb67b399fc,0de21810c9..b7aee1abb2
--- a/rev-list.c
+++ b/rev-list.c
@@@ -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)