Merge branch 'jk/read-commit-buffer-data-after-free'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 1eeed0ffd8c7b6d052be538a10af39861738c2b2..240bff3efa80b3af087fe1e6c16a75108ffee4de 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -282,9 +282,8 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 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)