• Jeff King's avatar
    mailinfo: make ">From" in-body header check more robust · 2da1f366
    Jeff King authored
    Since commit 81c5cf78 (mailinfo: skip bogus UNIX From line inside
    body, 2006-05-21), we have treated lines like ">From" in the body as
    headers. This makes "git am" work for people who erroneously paste
    the whole output from format-patch:
      From 12345abcd...fedcba543210 Mon Sep 17 00:00:00 2001
      From: them
      Subject: [PATCH] whatever
    into their email body (assuming that an mbox writer then quotes
    "From" as ">From", as otherwise we would actually mailsplit on the
    in-body line).
    However, this has false positives if somebody actually has a commit
    body that starts with "From "; in this case we erroneously remove
    the line entirely from the commit message. We can make this check
    more robust by making sure the line actually looks like a real mbox
    "From" line.
    Inspect the line that begins with ">From " a more carefully to only
    skip lines that match the expected pattern (note that the datestamp
    part of the format-patch output is designed to be kept constant to
    help those who write magic(5) entries).
    Signed-off-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
t5100-mailinfo.sh 3.1 KB