diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-09 16:37:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-09 16:37:49 -0800 |
| commit | 429748517298b37d686d592a18d17a14e4280b92 (patch) | |
| tree | 8e3a2817ae2b51d8b219f4e7654d0f3e6e1dae0d | |
| parent | 340581bcf11bd6e85f87af1d732c898885929e90 (diff) | |
| parent | 219d54ae8c96bcb84d0216797af7572fff7199b8 (diff) | |
| download | git-429748517298b37d686d592a18d17a14e4280b92.tar.xz | |
Merge branch 'ss/format-patch-use-encode-headers-for-cover-letter'
"git format-patch --encode-email-headers" ignored the option when
preparing the cover letter, which has been corrected.
* ss/format-patch-use-encode-headers-for-cover-letter:
format-patch: fix ignored encode_email_headers for cover letter
| -rw-r--r-- | builtin/log.c | 1 | ||||
| -rwxr-xr-x | t/t4014-format-patch.sh | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index ba775d7b5c..87fd1c8560 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1364,6 +1364,7 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file, pp.date_mode.type = DATE_RFC2822; pp.rev = rev; pp.print_email_subject = 1; + pp.encode_email_headers = rev->encode_email_headers; pp_user_info(&pp, NULL, &sb, committer, encoding); prepare_cover_text(&pp, description_file, branch_name, &sb, encoding, need_8bit_cte); diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 5ced27ed45..e37a1411ee 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1906,6 +1906,16 @@ body" && grep "^body$" actual ' +test_expect_success 'cover letter with --cover-from-description subject (UTF-8 subject line)' ' + test_config branch.rebuild-1.description "Café? + +body" && + git checkout rebuild-1 && + git format-patch --stdout --cover-letter --cover-from-description subject --encode-email-headers main >actual && + grep "^Subject: \[PATCH 0/2\] =?UTF-8?q?Caf=C3=A9=3F?=$" actual && + ! grep "Café" actual +' + test_expect_success 'cover letter with format.coverFromDescription = auto (short subject line)' ' test_config branch.rebuild-1.description "config subject |