diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2012-12-11 06:59:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-11 10:01:44 -0800 |
| commit | 5b59708268c82262fb13fb8681663dd158b030bd (patch) | |
| tree | 42d7b69fcd74c67a83143085a3053a10c2c8c38b /builtin | |
| parent | 14e1a4e1ff70aff36db3f5d2a8b806efd0134d50 (diff) | |
| download | git-5b59708268c82262fb13fb8681663dd158b030bd.tar.gz git-5b59708268c82262fb13fb8681663dd158b030bd.tar.xz | |
shortlog: fix wrapping lines of wraplen
A recent commit [1] fixed a off-by-one wrapping error. As a
side-effect, the conditional in add_wrapped_shortlog_msg() to decide
whether to append a newline needs to be removed. The function
should always append a newline, which was the case before the
off-by-one fix, because strbuf_add_wrapped_text() never returns a
value of wraplen; when it returns wraplen, the string does not end
with a newline, so this caller needs to add one anyway.
[1] 14e1a4e1ff70aff36db3f5d2a8b806efd0134d50 utf8: fix off-by-one
wrapping of text
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 37f3193a3..52f928428 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) |