diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:38:11 -0700 |
| commit | e25a4ded8a47333a4c71a224927d6df87d7c295e (patch) | |
| tree | 7a0801d3ea9453ee23101f187e1ef9bf65b2ac48 /log-tree.c | |
| parent | 1e4bf907890e094f1c1c8c5086387e7d5fdb0655 (diff) | |
| parent | d9925d1a714a440f4063f64e1bd776194d2dd918 (diff) | |
| download | git-e25a4ded8a47333a4c71a224927d6df87d7c295e.tar.gz | |
Merge branch 'ew/mboxrd-format-am'
Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.
* ew/mboxrd-format-am:
am: support --patch-format=mboxrd
mailsplit: support unescaping mboxrd messages
pretty: support "mboxrd" output format
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c index 78a5381d0e..48daf84d3b 100644 --- a/log-tree.c +++ b/log-tree.c @@ -603,7 +603,7 @@ void show_log(struct rev_info *opt) * Print header line of header.. */ - if (opt->commit_format == CMIT_FMT_EMAIL) { + if (cmit_fmt_is_mail(opt->commit_format)) { log_write_email_headers(opt, commit, &ctx.subject, &extra_headers, &ctx.need_8bit_cte); } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { @@ -694,7 +694,7 @@ void show_log(struct rev_info *opt) if ((ctx.fmt != CMIT_FMT_USERFORMAT) && ctx.notes_message && *ctx.notes_message) { - if (ctx.fmt == CMIT_FMT_EMAIL) { + if (cmit_fmt_is_mail(ctx.fmt)) { strbuf_addstr(&msgbuf, "---\n"); opt->shown_dashes = 1; } |