| commit | e3f67d30b20e49d8fc3eefe819808cba7998b060 | |
| author | Stephen Boyd <bebarino@gmail.com> | |
| Tue, 26 Jan 2010 00:33:59 +0000 (25 16:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Jan 2010 00:43:36 +0000 (25 16:43 -0800) | ||
| tree | 7582707fabddd36897bfa25504ad7c3e2ccefbbc | treesnapshot (tar.gz zip) |
| parent | f4e6dcc36c37a6e62c8900ed657330356f6e2d8e | commitdiff |
am: fix patch format detection for Thunderbird "Save As" emails
The patch detection wants to inspect all the headers of a rfc2822 message
and ensure that they look like header fields. The headers are always
separated from the message body with a blank line. When Thunderbird saves
the message the blank line separating the headers from the body includes a
CR. The patch detection is failing because a CRLF doesn't match /^$/. Fix
this by allowing a CR to exist on the separating line.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The patch detection wants to inspect all the headers of a rfc2822 message
and ensure that they look like header fields. The headers are always
separated from the message body with a blank line. When Thunderbird saves
the message the blank line separating the headers from the body includes a
CR. The patch detection is failing because a CRLF doesn't match /^$/. Fix
this by allowing a CR to exist on the separating line.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diffblobblamehistory | |
| t/t4150-am.sh | diffblobblamehistory |