diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:40:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:40:34 -0800 |
| commit | 71288e15dfd6638d14b307b564d1230a4500daa1 (patch) | |
| tree | 7e81aaa5b75de0df9c359838094c82a06c635dce /builtin/shortlog.c | |
| parent | b05d8c62d306071729eb3d905042385bb93b9fcd (diff) | |
| parent | e0db1765c3bb108b55ebf82b4e5962f9d1f5e5b7 (diff) | |
| download | git-71288e15dfd6638d14b307b564d1230a4500daa1.tar.gz | |
Merge branch 'sp/shortlog-missing-lf'
When a line to be wrapped has a solid run of non space characters
whose length exactly is the wrap width, "git shortlog -w" failed to
add a newline after such a line.
* sp/shortlog-missing-lf:
strbuf_add_wrapped*(): Remove unused return value
shortlog: fix wrapping lines of wraplen
Diffstat (limited to 'builtin/shortlog.c')
| -rw-r--r-- | builtin/shortlog.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c index b316cf37ca..83605143ac 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -306,9 +306,8 @@ parse_done: static void add_wrapped_shortlog_msg(struct strbuf *sb, const char *s, const struct shortlog *log) { - int col = strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap); - if (col != log->wrap) - strbuf_addch(sb, '\n'); + strbuf_add_wrapped_text(sb, s, log->in1, log->in2, log->wrap); + strbuf_addch(sb, '\n'); } void shortlog_output(struct shortlog *log) |