diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-10 14:04:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 14:04:23 -0800 |
| commit | 74474a94f217a0499cc23346d8d094893fb46257 (patch) | |
| tree | b3c061af3a9ee948ddd7d2fb28dedafd72765917 /builtin | |
| parent | 2601298f43a9375ae996b4b3c9afeeb29ba5d597 (diff) | |
| parent | e0db1765c3bb108b55ebf82b4e5962f9d1f5e5b7 (diff) | |
| download | git-74474a94f217a0499cc23346d8d094893fb46257.tar.gz | |
Merge branch 'sp/shortlog-missing-lf' into maint
* sp/shortlog-missing-lf:
strbuf_add_wrapped*(): Remove unused return value
shortlog: fix wrapping lines of wraplen
Diffstat (limited to 'builtin')
| -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) |