From 8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 14 Apr 2006 22:43:34 -0700 Subject: [PATCH] Fix up rev-list option parsing. rev-list does not take diff options, so barf after seeing some. Signed-off-by: Junio C Hamano --- rev-list.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.30.2