From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: bmwill@google.com, git@vger.kernel.org, gitster@pobox.com,
jonathantanmy@google.com, jrnieder@gmail.com,
mhagger@alum.mit.edu, peff@peff.net
Subject: [PATCHv3 02/20] diff: move line ending check into emit_hunk_header
Date: Thu, 18 May 2017 12:37:28 -0700 [thread overview]
Message-ID: <20170518193746.486-3-sbeller@google.com> (raw)
In-Reply-To: <20170518193746.486-1-sbeller@google.com>
The emit_hunk_header() function is responsible for assembling a
hunk header and calling emit_line() to send the hunk header
to the output file. Its only caller fn_out_consume() needs
to prepare for a case where the function emits an incomplete
line and add the terminating LF.
Instead make sure emit_hunk_header() to always send a
completed line to emit_line().
Signed-off-by: Stefan Beller <sbeller@google.com>
---
diff.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 3f5bf8b5a4..c2ed605cd0 100644
--- a/diff.c
+++ b/diff.c
@@ -677,6 +677,8 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
}
strbuf_add(&msgbuf, line + len, org_len - len);
+ strbuf_complete_line(&msgbuf);
+
emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
strbuf_release(&msgbuf);
}
@@ -1315,8 +1317,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.13.0.18.g7d86cc8ba0
next prev parent reply other threads:[~2017-05-18 19:38 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-14 4:00 [RFC PATCH 00/19] Diff machine: highlight moved lines Stefan Beller
2017-05-14 4:00 ` [PATCH 01/19] diff: readability fix Stefan Beller
2017-05-14 4:01 ` [PATCH 02/19] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-15 6:48 ` Junio C Hamano
2017-05-15 16:13 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 03/19] diff.c: drop 'nofirst' from emit_line_0 Stefan Beller
2017-05-15 18:26 ` Jonathan Tan
2017-05-15 18:33 ` Stefan Beller
2017-05-16 16:05 ` Jonathan Tan
2017-05-15 19:22 ` Brandon Williams
2017-05-15 19:35 ` Stefan Beller
2017-05-15 19:45 ` Brandon Williams
2017-05-14 4:01 ` [PATCH 04/19] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-14 4:01 ` [PATCH 05/19] diff.c: emit_line_0 can handle no color setting Stefan Beller
2017-05-15 18:31 ` Jonathan Tan
2017-05-15 22:11 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 06/19] diff: add emit_line_fmt Stefan Beller
2017-05-15 19:31 ` Brandon Williams
2017-05-14 4:01 ` [PATCH 07/19] diff.c: convert fn_out_consume to use emit_line_* Stefan Beller
2017-05-16 1:00 ` Junio C Hamano
2017-05-16 1:05 ` Junio C Hamano
2017-05-16 16:23 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 08/19] diff.c: convert builtin_diff " Stefan Beller
2017-05-15 18:42 ` Jonathan Tan
2017-05-14 4:01 ` [PATCH 09/19] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-14 4:01 ` [PATCH 10/19] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-15 19:09 ` Jonathan Tan
2017-05-15 19:31 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 11/19] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-14 4:01 ` [PATCH 12/19] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-14 4:01 ` [PATCH 13/19] diff.c: convert show_stats " Stefan Beller
2017-05-14 4:01 ` [PATCH 14/19] diff.c: convert word diffing " Stefan Beller
2017-05-15 22:40 ` Jonathan Tan
2017-05-15 23:12 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 15/19] diff.c: convert diff_flush " Stefan Beller
2017-05-15 20:21 ` Jonathan Tan
2017-05-15 22:08 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 16/19] diff.c: convert diff_summary " Stefan Beller
2017-05-14 4:01 ` [PATCH 17/19] diff.c: factor out emit_line_ws for coloring whitespaces Stefan Beller
2017-05-14 4:01 ` [PATCH 18/19] diff: buffer all output if asked to Stefan Beller
2017-05-14 4:06 ` Jeff King
2017-05-14 4:25 ` Stefan Beller
2017-05-16 4:14 ` Jonathan Tan
2017-05-16 16:42 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 19/19] diff.c: color moved lines differently Stefan Beller
2017-05-15 22:42 ` Brandon Williams
2017-05-16 4:34 ` Jonathan Tan
2017-05-16 12:31 ` Jeff King
2017-05-15 12:43 ` [RFC PATCH 00/19] Diff machine: highlight moved lines Junio C Hamano
2017-05-15 16:33 ` Stefan Beller
2017-05-17 2:58 ` [PATCHv2 00/20] " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 01/20] diff: readability fix Stefan Beller
2017-05-17 2:58 ` [PATCHv2 02/20] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-17 2:58 ` [PATCHv2 03/20] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-17 2:58 ` [PATCHv2 04/20] diff.c: teach emit_line_0 to accept sign parameter Stefan Beller
2017-05-17 2:58 ` [PATCHv2 05/20] diff.c: emit_line_0 can handle no color setting Stefan Beller
2017-05-17 2:58 ` [PATCHv2 06/20] diff.c: emit_line_0 takes parameter whether to output line prefix Stefan Beller
2017-05-17 2:58 ` [PATCHv2 07/20] diff.c: inline emit_line_0 into emit_line Stefan Beller
2017-05-17 2:58 ` [PATCHv2 08/20] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-17 2:58 ` [PATCHv2 09/20] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-17 2:58 ` [PATCHv2 10/20] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 11/20] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-17 5:03 ` Junio C Hamano
2017-05-17 21:16 ` Stefan Beller
2017-05-18 3:35 ` Junio C Hamano
2017-05-17 2:58 ` [PATCHv2 12/20] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-17 5:19 ` Junio C Hamano
2017-05-17 21:05 ` Stefan Beller
2017-05-18 3:25 ` Junio C Hamano
2017-05-18 17:12 ` Stefan Beller
2017-05-20 4:50 ` Junio C Hamano
2017-05-20 22:00 ` Stefan Beller
2017-05-17 2:58 ` [PATCHv2 13/20] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-17 2:58 ` [PATCHv2 14/20] diff.c: convert show_stats " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 15/20] diff.c: convert word diffing " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 16/20] diff.c: convert diff_flush " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 17/20] diff.c: convert diff_summary " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 18/20] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-17 2:58 ` [PATCHv2 19/20] diff: buffer all output if asked to Stefan Beller
2017-05-17 2:58 ` [PATCHv2 20/20] diff.c: color moved lines differently Stefan Beller
2017-05-18 19:37 ` [PATCHv3 00/20] Diff machine: highlight moved lines Stefan Beller
2017-05-18 19:37 ` [PATCHv3 01/20] diff: readability fix Stefan Beller
2017-05-18 19:37 ` Stefan Beller [this message]
2017-05-18 19:37 ` [PATCHv3 03/20] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-18 19:37 ` [PATCHv3 04/20] diff.c: teach emit_line_0 to accept sign parameter Stefan Beller
2017-05-18 23:33 ` Jonathan Tan
2017-05-22 23:36 ` Stefan Beller
2017-05-18 19:37 ` [PATCHv3 05/20] diff.c: emit_line_0 can handle no color setting Stefan Beller
2017-05-18 19:37 ` [PATCHv3 06/20] diff.c: emit_line_0 takes parameter whether to output line prefix Stefan Beller
2017-05-18 19:37 ` [PATCHv3 07/20] diff.c: inline emit_line_0 into emit_line Stefan Beller
2017-05-18 19:37 ` [PATCHv3 08/20] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-18 19:37 ` [PATCHv3 09/20] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-18 19:37 ` [PATCHv3 10/20] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 11/20] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 12/20] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-18 19:37 ` [PATCHv3 13/20] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-18 19:37 ` [PATCHv3 14/20] diff.c: convert show_stats " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 15/20] diff.c: convert word diffing " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 16/20] diff.c: convert diff_flush " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 17/20] diff.c: convert diff_summary " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 18/20] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-18 19:37 ` [PATCHv3 19/20] diff: buffer all output if asked to Stefan Beller
2017-05-18 19:37 ` [PATCHv3 20/20] diff.c: color moved lines differently Stefan Beller
2017-05-19 18:23 ` Jonathan Tan
2017-05-19 18:40 ` Stefan Beller
2017-05-19 19:34 ` Jonathan Tan
2017-05-23 2:40 ` [PATCHv4 00/17] Diff machine: highlight moved lines Stefan Beller
2017-05-23 2:40 ` [PATCHv4 01/17] diff: readability fix Stefan Beller
2017-05-23 2:40 ` [PATCHv4 02/17] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-23 2:40 ` [PATCHv4 03/17] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-23 2:40 ` [PATCHv4 04/17] diff: introduce more flexible emit function Stefan Beller
2017-05-23 2:40 ` [PATCHv4 05/17] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-23 2:40 ` [PATCHv4 06/17] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-23 2:40 ` [PATCHv4 07/17] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 08/17] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 09/17] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-23 5:59 ` Junio C Hamano
2017-05-23 18:14 ` Stefan Beller
2017-05-23 2:40 ` [PATCHv4 10/17] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-23 2:40 ` [PATCHv4 11/17] diff.c: convert show_stats " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 12/17] diff.c: convert word diffing " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 13/17] diff.c: convert diff_flush " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 14/17] diff.c: convert diff_summary " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 15/17] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-23 2:40 ` [PATCHv4 16/17] diff: buffer all output if asked to Stefan Beller
2017-05-23 2:40 ` [PATCHv4 17/17] diff.c: color moved lines differently Stefan Beller
2017-05-27 1:04 ` [PATCHv4 00/17] Diff machine: highlight moved lines Jacob Keller
2017-05-30 21:38 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170518193746.486-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).