From fd1062e52e1a7ed3be443a320708ed849958c1bf Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 1 Apr 2017 12:14:39 -0700 Subject: mailinfo: fix in-body header continuations An empty line should stop any pending in-body headers, and start the actual body parsing. This also modifies the original test for the in-body headers to actually have a real commit body that starts with spaces, and changes the test to check that the long line matches _exactly_, and doesn't get extra data from the body. Fixes:6b4b013f1884 ("mailinfo: handle in-body header continuations") Cc: Jonathan Tan Cc: Jeff King Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- mailinfo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mailinfo.c') diff --git a/mailinfo.c b/mailinfo.c index 2275b285f0..1e4e283099 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -674,8 +674,13 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line) assert(!mi->filter_stage); if (mi->header_stage) { - if (!line->len || (line->len == 1 && line->buf[0] == '\n')) + if (!line->len || (line->len == 1 && line->buf[0] == '\n')) { + if (mi->inbody_header_accum.len) { + flush_inbody_header_accum(mi); + mi->header_stage = 0; + } return 0; + } } if (mi->use_inbody_headers && mi->header_stage) { -- cgit v1.2.1