summaryrefslogtreecommitdiff
path: root/builtin-shortlog.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-30 14:42:28 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-30 14:42:28 -0800
commita689faeb5850174edfbbb0a502ef7eee8cd06d76 (patch)
treec1ce351a69efce2b7c0a7a2773ffd934a9888e6f /builtin-shortlog.c
parent1bab4bba5457bd55fc1c27ddc4218b4b375c8251 (diff)
parent79f7ca063d6b74e9d7f3db90c85dfa4a162128e4 (diff)
downloadgit-a689faeb5850174edfbbb0a502ef7eee8cd06d76.tar.gz
Merge branch 'uk/maint-shortlog-encoding'
Conflicts: builtin-shortlog.c
Diffstat (limited to 'builtin-shortlog.c')
-rw-r--r--builtin-shortlog.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 8aa63c7857..b3b055f68c 100644
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -139,8 +139,12 @@ static void read_from_stdin(struct shortlog *log)
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
{
const char *author = NULL, *buffer;
+ struct strbuf buf = STRBUF_INIT;
+ struct strbuf ufbuf = STRBUF_INIT;
+ struct pretty_print_context ctx = {0};
- buffer = commit->buffer;
+ pretty_print_commit(CMIT_FMT_RAW, commit, &buf, &ctx);
+ buffer = buf.buf;
while (*buffer && *buffer != '\n') {
const char *eol = strchr(buffer, '\n');
@@ -157,20 +161,19 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
die("Missing author: %s",
sha1_to_hex(commit->object.sha1));
if (log->user_format) {
- struct strbuf buf = STRBUF_INIT;
struct pretty_print_context ctx = {0};
ctx.abbrev = DEFAULT_ABBREV;
ctx.subject = "";
ctx.after_subject = "";
ctx.date_mode = DATE_NORMAL;
- pretty_print_commit(CMIT_FMT_USERFORMAT, commit, &buf, &ctx);
- insert_one_record(log, author, buf.buf);
- strbuf_release(&buf);
- return;
- }
- if (*buffer)
+ pretty_print_commit(CMIT_FMT_USERFORMAT, commit, &ufbuf, &ctx);
+ buffer = ufbuf.buf;
+ } else if (*buffer) {
buffer++;
+ }
insert_one_record(log, author, !*buffer ? "<none>" : buffer);
+ strbuf_release(&ufbuf);
+ strbuf_release(&buf);
}
static void get_from_rev(struct rev_info *rev, struct shortlog *log)