summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-15 05:43:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-15 05:43:34 (GMT)
commit8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1 (patch)
tree7b34556c9b5a890e36d381913f530a3e5fee9305
parent8e8f998739db6526fe890fabc88c866759bc2ac3 (diff)
downloadgit-8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1.zip
git-8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1.tar.gz
git-8c1f0b44c59530dea8007a9f5b69d0fac6aea3b1.tar.bz2
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rev-list.c b/rev-list.c
index 963707a..0de2181 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;