From: Junio C Hamano <junkio@cox.net>
Date: Sat, 15 Apr 2006 05:43:34 +0000 (-0700)
Subject: Fix up rev-list option parsing.
X-Git-Tag: v1.4.0-rc1~239^2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1;p=git.git

Fix up rev-list option parsing.

rev-list does not take diff options, so barf after seeing some.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/rev-list.c b/rev-list.c
index 963707a49..0de21810c 100644
--- 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;