diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-23 19:03:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 19:03:50 -0800 |
| commit | 46cdcc627522b83bbf1d60fb3bf703b88d237dc0 (patch) | |
| tree | 232e0eba127f643c01f2306752809901c6c0cbf1 /builtin-shortlog.c | |
| parent | Merge branch 'pj/maint-ldflags' into maint (diff) | |
| parent | shortlog: handle multi-line subjects like log --pretty=oneline et. al. do (diff) | |
| download | tgif-46cdcc627522b83bbf1d60fb3bf703b88d237dc0.tar.xz | |
Merge branch 'rs/maint-shortlog-foldline' into maint
* rs/maint-shortlog-foldline:
shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
Diffstat (limited to 'builtin-shortlog.c')
| -rw-r--r-- | builtin-shortlog.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin-shortlog.c b/builtin-shortlog.c index d03f14fdad..e49290687f 100644 --- a/builtin-shortlog.c +++ b/builtin-shortlog.c @@ -29,6 +29,9 @@ static int compare_by_number(const void *a1, const void *a2) return -1; } +const char *format_subject(struct strbuf *sb, const char *msg, + const char *line_separator); + static void insert_one_record(struct shortlog *log, const char *author, const char *oneline) @@ -41,6 +44,7 @@ static void insert_one_record(struct shortlog *log, size_t len; const char *eol; const char *boemail, *eoemail; + struct strbuf subject = STRBUF_INIT; boemail = strchr(author, '<'); if (!boemail) @@ -89,9 +93,8 @@ static void insert_one_record(struct shortlog *log, while (*oneline && isspace(*oneline) && *oneline != '\n') oneline++; len = eol - oneline; - while (len && isspace(oneline[len-1])) - len--; - buffer = xmemdupz(oneline, len); + format_subject(&subject, oneline, " "); + buffer = strbuf_detach(&subject, NULL); if (dot3) { int dot3len = strlen(dot3); |