Merge branch 'rs/use-strbuf-complete-line'

* rs/use-strbuf-complete-line: use strbuf_complete_line() for adding a newline if needed
2014-12-22 12:28:22 -08:00
parent 35b5a8b769 a0d4923ddf
commit a305b15f82
3 changed files with 3 additions and 7 deletions
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@ -216,8 +216,7 @@ static void add_branch_desc(struct strbuf *out, const char *name)
 			strbuf_addf(out, "  : %.*s", (int)(ep - bp), bp);
 			bp = ep;
 		}
-		if (out->buf[out->len - 1] != '\n')
-			strbuf_addch(out, '\n');
+		strbuf_complete_line(out);
 	}
 	strbuf_release(&desc);
 }