summaryrefslogtreecommitdiff
path: root/builtin/shortlog.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-09-24 23:29:00 -0700
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-09-24 23:29:00 -0700
commit7f794aab3eb84fedf1240c845976cab1c566c716 (patch)
tree9790ca68355e0981ea201a912bb68dfe40ebb368 /builtin/shortlog.c
parentMerge branch 'jc/strcasecmp-pure-inline' (diff)
parentshortlog: ignore commits with missing authors (diff)
downloadtgif-7f794aab3eb84fedf1240c845976cab1c566c716.tar.xz
Merge branch 'jk/shortlog-tolerate-broken-commit'
* jk/shortlog-tolerate-broken-commit: shortlog: ignore commits with missing authors
Diffstat (limited to 'builtin/shortlog.c')
-rw-r--r--builtin/shortlog.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index ae73d17b6c..c226f767aa 100644
--- 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;