summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-06-05 04:46:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-06 18:14:14 (GMT)
commit9f23e040615857e3909db51a5420f338c9831b5a (patch)
tree65aab42cd4b6eee9f84382de80f871ff3c3973d1 /builtin
parent6326f199252a1a5fbdea105473f8305d850cdd87 (diff)
downloadgit-9f23e040615857e3909db51a5420f338c9831b5a.zip
git-9f23e040615857e3909db51a5420f338c9831b5a.tar.gz
git-9f23e040615857e3909db51a5420f338c9831b5a.tar.bz2
pretty: support "mboxrd" output format
This output format prevents format-patch output from breaking readers if somebody copy+pasted an mbox into a commit message. Unlike the traditional "mboxo" format, "mboxrd" is designed to be fully-reversible. "mboxrd" also gracefully degrades to showing extra ">" in existing "mboxo" readers. This degradation is preferable to breaking message splitting completely, a problem I've seen in "mboxcl" due to having multiple, non-existent, or inaccurate Content-Length headers. "mboxcl2" is a non-starter since it's inherits the problems of "mboxcl" while being completely incompatible with existing tooling based around mailsplit. ref: http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 099f4f7..6d6f368 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -953,7 +953,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct pretty_print_context pp = {0};
struct commit *head = list[0];
- if (rev->commit_format != CMIT_FMT_EMAIL)
+ if (!cmit_fmt_is_mail(rev->commit_format))
die(_("Cover letter needs email format"));
committer = git_committer_info(0);