summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 12:28:22 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 12:28:22 -0800
commita305b15f82984bd000351e5ab4720a4a170e42b0 (patch)
tree57610b81424bc4aecbfd7a6da78c1d1ca7a0167f
parent35b5a8b76999e3c48c3e01c3fd8559bd447d2dfa (diff)
parenta0d4923ddfb65c91d2b84ca74eee09424f986a8b (diff)
downloadgit-a305b15f82984bd000351e5ab4720a4a170e42b0.tar.gz
Merge branch 'rs/use-strbuf-complete-line'
* rs/use-strbuf-complete-line: use strbuf_complete_line() for adding a newline if needed
-rw-r--r--builtin/fmt-merge-msg.c3
-rw-r--r--notes-utils.c3
-rw-r--r--trace.c4
3 files changed, 3 insertions, 7 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 37177c6c29..af7919e51e 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);
}
diff --git a/notes-utils.c b/notes-utils.c
index b64dc1b021..ccbf0737a3 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -44,8 +44,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
/* Prepare commit message and reflog message */
strbuf_addstr(&buf, msg);
- if (buf.buf[buf.len - 1] != '\n')
- strbuf_addch(&buf, '\n'); /* Make sure msg ends with newline */
+ strbuf_complete_line(&buf);
create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1);
strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
diff --git a/trace.c b/trace.c
index 4778608941..f6f9f3a367 100644
--- a/trace.c
+++ b/trace.c
@@ -122,9 +122,7 @@ static int prepare_trace_line(const char *file, int line,
static void print_trace_line(struct trace_key *key, struct strbuf *buf)
{
- /* append newline if missing */
- if (buf->len && buf->buf[buf->len - 1] != '\n')
- strbuf_addch(buf, '\n');
+ strbuf_complete_line(buf);
write_or_whine_pipe(get_trace_fd(key), buf->buf, buf->len, err_msg);
strbuf_release(buf);