Sync with 'maint'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index ae73d17b6cbc22f3a7eb30aff5a14cda27c5876c..c226f767aa9b0e5633a3d5dde7b0b969fec39c7f 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -127,9 +127,11 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
                        author = buffer + 7;
                buffer = eol;
        }
-       if (!author)
-               die(_("Missing author: %s"),
+       if (!author) {
+               warning(_("Missing author: %s"),
                    sha1_to_hex(commit->object.sha1));
+               return;
+       }
        if (log->user_format) {
                struct pretty_print_context ctx = {0};
                ctx.fmt = CMIT_FMT_USERFORMAT;