diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 08:38:21 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 08:38:21 +0300 |
commit | 4e0086bea1dd58193b05ff4b5b0ac8819334e359 (patch) | |
tree | 4741e2418cf678a61ddec6c37c6163cabf8607ed /builtin | |
parent | 71cdbb3d4a07811ac29d2097e942607fbe1ddf33 (diff) | |
parent | 50cd54ef4e6f4279683b61417a35de7297b55b9d (diff) |
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 'builtin')
-rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 75f7ff0441..a15599f4f0 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1019,7 +1019,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet)) return; - log_write_email_headers(rev, head, &pp.after_subject, &need_8bit_cte); + log_write_email_headers(rev, head, &pp.after_subject, &need_8bit_cte, 0); for (i = 0; !need_8bit_cte && i < nr; i++) { const char *buf = get_commit_buffer(list[i], NULL); |