Thanks, Peff, for the explanation and the method to reproduce the issue. The issue seems to be in mailinfo.c - this patch set addresses that, and I have also included a test for "git am" in t/t4150-am.sh to show the effect of this patch set on that command. Jonathan Tan (3): mailinfo: refactor commit message processing mailinfo: correct malformed test example mailinfo: handle in-body header continuations mailinfo.c | 165 ++++++++++++++++++++++++++++------- mailinfo.h | 1 + t/t4150-am.sh | 23 +++++ t/t5100-mailinfo.sh | 4 +- t/t5100/info0008--no-inbody-headers | 5 ++ t/t5100/info0018 | 5 ++ t/t5100/msg0008--no-inbody-headers | 6 ++ t/t5100/msg0015--no-inbody-headers | 1 + t/t5100/msg0018 | 2 + t/t5100/patch0008--no-inbody-headers | 0 t/t5100/patch0018 | 6 ++ t/t5100/sample.mbox | 20 +++++ 12 files changed, 206 insertions(+), 32 deletions(-) create mode 100644 t/t5100/info0008--no-inbody-headers create mode 100644 t/t5100/info0018 create mode 100644 t/t5100/msg0008--no-inbody-headers create mode 100644 t/t5100/msg0018 create mode 100644 t/t5100/patch0008--no-inbody-headers create mode 100644 t/t5100/patch0018 -- 2.10.0.rc2.20.g5b18e70