undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* rs/use-strbuf-complete-line:
  use strbuf_complete_line() for adding a newline if needed
This commit is contained in:
Junio C Hamano 2014-12-22 12:28:22 -08:00
commit a305b15f82
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fmt-merge-msg.c
View File

@ -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);
}

3
notes-utils.c
View File

@ -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 */

4
trace.c
View File

@ -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);