Merge branch 'jt/avoid-ls-refs-with-http'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 88f88e97b28c24f74aad6ec6cf1c637003f41a85..65cd41392c1c5e256313b10812a39bf4b848ce1b 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -287,6 +287,8 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
                case PARSE_OPT_HELP:
                case PARSE_OPT_ERROR:
                        exit(129);
+               case PARSE_OPT_COMPLETE:
+                       exit(0);
                case PARSE_OPT_DONE:
                        goto parse_done;
                }