diff options
| -rw-r--r-- | builtin-shortlog.c | 11 | ||||
| -rw-r--r-- | shortlog.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/builtin-shortlog.c b/builtin-shortlog.c index 0136202..f8bcbfc 100644 --- a/builtin-shortlog.c +++ b/builtin-shortlog.c @@ -154,6 +154,15 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit) if (!author) die("Missing author: %s", sha1_to_hex(commit->object.sha1)); + if (log->user_format) { + struct strbuf buf = STRBUF_INIT; + + pretty_print_commit(CMIT_FMT_USERFORMAT, commit, &buf, + DEFAULT_ABBREV, "", "", DATE_NORMAL, 0); + insert_one_record(log, author, buf.buf); + strbuf_release(&buf); + return; + } if (*buffer) buffer++; insert_one_record(log, author, !*buffer ? "<none>" : buffer); @@ -271,6 +280,8 @@ parse_done: usage_with_options(shortlog_usage, options); } + log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT; + /* assume HEAD if from a tty */ if (!nongit && !rev.pending.nr && isatty(0)) add_head_to_pending(&rev); @@ -11,6 +11,7 @@ struct shortlog { int wrap; int in1; int in2; + int user_format; char *common_repo_prefix; int email; |