diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-14 22:43:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-14 22:43:34 -0700 |
| commit | 8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1 (patch) | |
| tree | 7b34556c9b5a890e36d381913f530a3e5fee9305 | |
| parent | Fix up default abbrev in setup_revisions() argument parser. (diff) | |
| download | tgif-8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1.tar.xz | |
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>
| -rw-r--r-- | rev-list.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rev-list.c b/rev-list.c index 963707a495..0de21810c9 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; |