path: root/builtin/shortlog.c
diff options
authorSteffen Prohaska <>2012-12-11 05:59:21 (GMT)
committerJunio C Hamano <>2012-12-11 18:01:44 (GMT)
commit5b59708268c82262fb13fb8681663dd158b030bd (patch)
tree42d7b69fcd74c67a83143085a3053a10c2c8c38b /builtin/shortlog.c
parent14e1a4e1ff70aff36db3f5d2a8b806efd0134d50 (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/shortlog.c')
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 37f3193..52f9284 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)