[PATCH] am: fix patch format detection for Thunderbird "Save As" emails
From: Stephen Boyd <hidden>
Date: 2016-06-15 22:47:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
The patch detection wants to inspect all the headers of a rfc2822 message and ensure that they look like header field names. The headers are always separated from the message body with a blank line. When Thunderbird3 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. --- I'm not sure how portable \r in a sed invocation is. Perhaps just checking that l1, l2, and l3 are rfc2822 header fields (or indented lines) is better than trying to check all of the headers? This seems related to am fails to apply patches for files with CRLF lineendings http://article.gmane.org/gmane.comp.version-control.git/135229 but seems necessary because check_patch_format() is called before any splitting with mailsplit is done (where I assume the fix for the issue will be done). git-am.sh | 2 +- t/t4150-am.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 4838cdb..bb106b7 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -204,7 +204,7 @@ 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" | + sed -n -e '/^\r*$/q' -e '/^[ ]/d' -e p "$1" | sane_egrep -v '^[!-9;-~]+:' >/dev/null || patch_format=mbox fi
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 8296605..578bc81 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh@@ -83,6 +83,12 @@ test_expect_success setup ' echo "X-Fake-Field: Line Three" && git format-patch --stdout first | sed -e "1d" } > patch1.eml && + { + echo "X-Fake-Field: Line One" && + echo "X-Fake-Field: Line Two" && + echo "X-Fake-Field: Line Three" && + git format-patch --stdout first | sed -e "1d" + } | sed -e "s/$/\r/" > patch1-crlf.eml && sed -n -e "3,\$p" msg >file && git add file && test_tick &&
@@ -123,6 +129,15 @@ test_expect_success 'am applies patch e-mail not in a mbox' ' test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)" ' +test_expect_success 'am applies patch e-mail not in a mbox with CRLF' ' + git checkout first && + git am patch1-crlf.eml && + ! test -d .git/rebase-apply && + test -z "$(git diff second)" && + test "$(git rev-parse second)" = "$(git rev-parse HEAD)" && + test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)" +' + GIT_AUTHOR_NAME="Another Thor" GIT_AUTHOR_EMAIL="a.thor@example.com" GIT_COMMITTER_NAME="Co M Miter"
--
1.6.6.rc3.1.g8df51