summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-12-12 19:16:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-12 19:23:45 (GMT)
commita0d4923ddfb65c91d2b84ca74eee09424f986a8b (patch)
tree98b95c9d176819abff5b8d7bfe904265777f2ddd /builtin/fmt-merge-msg.c
parent7fa1365c54c28b3cd9375539f381b54061a1880d (diff)
downloadgit-a0d4923ddfb65c91d2b84ca74eee09424f986a8b.zip
git-a0d4923ddfb65c91d2b84ca74eee09424f986a8b.tar.gz
git-a0d4923ddfb65c91d2b84ca74eee09424f986a8b.tar.bz2
use strbuf_complete_line() for adding a newline if needed
Call strbuf_complete_line() instead of open-coding it. Also remove surrounding comments indicating the intent to complete a line since this information is already included in the function name. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
-rw-r--r--builtin/fmt-merge-msg.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 79df05e..b5c1ac2 100644
--- 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);
}