diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 12:14:39 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-04-11 00:49:40 -0700 |
| commit | fd1062e52e1a7ed3be443a320708ed849958c1bf (patch) | |
| tree | 3b80272b10bf546ef31dda81112acaea053d113e | |
| parent | Merge branch 'jt/mailinfo-fold-in-body-headers' (diff) | |
| download | tgif-fd1062e52e1a7ed3be443a320708ed849958c1bf.tar.xz | |
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 <jonathantanmy@google.com>
Cc: Jeff King <peff@peff.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | mailinfo.c | 7 | ||||
| -rwxr-xr-x | t/t4150-am.sh | 6 |
2 files changed, 10 insertions, 3 deletions
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) { diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 89a5bacac5..44807e218d 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -983,7 +983,9 @@ test_expect_success 'am works with multi-line in-body headers' ' rm -fr .git/rebase-apply && git checkout -f first && echo one >> file && - git commit -am "$LONG" --author="$LONG <long@example.com>" && + git commit -am "$LONG + + Body test" --author="$LONG <long@example.com>" && git format-patch --stdout -1 >patch && # bump from, date, and subject down to in-body header perl -lpe " @@ -997,7 +999,7 @@ test_expect_success 'am works with multi-line in-body headers' ' git am msg && # Ensure that the author and full message are present git cat-file commit HEAD | grep "^author.*long@example.com" && - git cat-file commit HEAD | grep "^$LONG" + git cat-file commit HEAD | grep "^$LONG$" ' test_done |