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>
git-mirror · Apr 15, 2006 · 8c1f0b4 · 8c1f0b4
1 parent 8e8f998
commit 8c1f0b4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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;