diff options
| author | Jeff King <peff@peff.net> | 2014-09-14 01:30:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-16 18:05:46 (GMT) |
| commit | 2da1f36671c3e3e28eba6a56d92249b6671c07d3 (patch) | |
| tree | bbb858c3e6190eed37c8ef9115c78e082707d645 /t/t5100/embed-from.expect | |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff) | |
| download | git-2da1f36671c3e3e28eba6a56d92249b6671c07d3.zip git-2da1f36671c3e3e28eba6a56d92249b6671c07d3.tar.gz git-2da1f36671c3e3e28eba6a56d92249b6671c07d3.tar.bz2 | |
mailinfo: make ">From" in-body header check more robust
Since commit 81c5cf7 (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: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/embed-from.expect')
| -rw-r--r-- | t/t5100/embed-from.expect | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t5100/embed-from.expect b/t/t5100/embed-from.expect new file mode 100644 index 0000000..06a3a38 --- /dev/null +++ b/t/t5100/embed-from.expect @@ -0,0 +1,5 @@ +Author: Commit Author +Email: commit@example.com +Subject: patch subject +Date: Sat, 13 Sep 2014 21:13:23 -0400 + |