diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 05:38:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 05:38:21 (GMT) |
| commit | 4e0086bea1dd58193b05ff4b5b0ac8819334e359 (patch) | |
| tree | 4741e2418cf678a61ddec6c37c6163cabf8607ed /t | |
| parent | 71cdbb3d4a07811ac29d2097e942607fbe1ddf33 (diff) | |
| parent | 50cd54ef4e6f4279683b61417a35de7297b55b9d (diff) | |
| download | git-4e0086bea1dd58193b05ff4b5b0ac8819334e359.zip git-4e0086bea1dd58193b05ff4b5b0ac8819334e359.tar.gz git-4e0086bea1dd58193b05ff4b5b0ac8819334e359.tar.bz2 | |
Merge branch 'bc/format-patch-cover-no-attach'
"git format-patch --cover --attach" created a broken MIME multipart
message for the cover letter, which has been fixed by keeping the
cover letter as plain text file.
* bc/format-patch-cover-no-attach:
format-patch: make cover letters always text/plain
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 482112c..6ea08fd 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1661,6 +1661,15 @@ test_expect_success 'format-patch --base with --attach' ' test_write_lines 1 2 >expect && test_cmp expect actual ' +test_expect_success 'format-patch --attach cover-letter only is non-multipart' ' + test_when_finished "rm -fr patches" && + git format-patch -o patches --cover-letter --attach=mimemime --base=HEAD~ -1 && + ! egrep "^--+mimemime" patches/0000*.patch && + egrep "^--+mimemime$" patches/0001*.patch >output && + test_line_count = 2 output && + egrep "^--+mimemime--$" patches/0001*.patch >output && + test_line_count = 1 output +' test_expect_success 'format-patch --pretty=mboxrd' ' sp=" " && |