summaryrefslogtreecommitdiff
path: root/builtin/shortlog.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-10 16:28:20 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-10 16:28:20 +0900
commit62c0fd46a875050e904831a73ef4375ed26cfaf6 (patch)
tree9bb09418c52e02a93f55c62826574ad26ac20f5b /builtin/shortlog.c
parentThe first batch for 2.18 cycle (diff)
parentparse-options: do not show usage upon invalid option value (diff)
downloadtgif-62c0fd46a875050e904831a73ef4375ed26cfaf6.tar.xz
Merge branch 'ps/contains-id-error-message'
"git tag --contains no-such-commit" gave a full list of options after giving an error message. * ps/contains-id-error-message: parse-options: do not show usage upon invalid option value
Diffstat (limited to 'builtin/shortlog.c')
-rw-r--r--builtin/shortlog.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 3a823b3128..608d6ba77b 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -284,6 +284,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
for (;;) {
switch (parse_options_step(&ctx, options, shortlog_usage)) {
case PARSE_OPT_HELP:
+ case PARSE_OPT_ERROR:
exit(129);
case PARSE_OPT_DONE:
goto parse_done;