From: Stefan Beller Date: Sun, 11 Sep 2016 05:42:01 GMT Subject: [PATCH 01/10] diff: move line ending check into emit_hunk_header Message-ID: <1473572530-25764-2-git-send-email-stefanbeller@gmail.com> In-Reply-To: <1473572530-25764-1-git-send-email-stefanbeller@gmail.com> From: Stefan Beller Signed-off-by: Stefan Beller --- diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index cc8e812..aa50b2d 100644 --- a/diff.c +++ b/diff.c @@ -610,6 +610,9 @@ static void emit_hunk_header(struct emit_callback *ecbdata, } strbuf_add(&msgbuf, line + len, org_len - len); + if (line[org_len - 1] != '\n') + strbuf_addch(&msgbuf, '\n'); + emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len); strbuf_release(&msgbuf); } @@ -1247,8 +1250,6 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) len = sane_truncate_line(ecbdata, line, len); find_lno(line, ecbdata); emit_hunk_header(ecbdata, line, len); - if (line[len-1] != '\n') - putc('\n', o->file); return; } -- 2.7.4