diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2010-01-25 16:33:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-25 16:43:36 -0800 |
| commit | e3f67d30b20e49d8fc3eefe819808cba7998b060 (patch) | |
| tree | 7582707fabddd36897bfa25504ad7c3e2ccefbbc /git-am.sh | |
| parent | f4e6dcc36c37a6e62c8900ed657330356f6e2d8e (diff) | |
| download | git-e3f67d30b20e49d8fc3eefe819808cba7998b060.tar.gz | |
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>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -205,7 +205,8 @@ check_patch_format () { # discarding the indented remainder of folded lines, # and see if it looks like that they all begin with the # header field names... - sed -n -e '/^$/q' -e '/^[ ]/d' -e p "$1" | + tr -d '\015' <"$1" | + sed -n -e '/^$/q' -e '/^[ ]/d' -e p | sane_egrep -v '^[!-9;-~]+:' >/dev/null || patch_format=mbox fi |