send-email: add transfer encoding header with content-type

[git.git] / log-tree.c

diff --git a/log-tree.c b/log-tree.c
index 8624d5a39ca3119fe7c4204a2c3b1f272a4b609d..b509c0c7ec239d4f426807406d94c34feeecf009 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -295,6 +295,9 @@ void show_log(struct rev_info *opt, const char *sep)
        if (opt->add_signoff)
                len = append_signoff(&msgbuf, &msgbuf_len, len,
                                     opt->add_signoff);
+       if (opt->show_log_size)
+               printf("log size %i\n", len);
+
        printf("%s%s%s", msgbuf, extra, sep);
        free(msgbuf);
 }
@@ -318,7 +321,8 @@ int log_tree_diff_flush(struct rev_info *opt)
                 * output for readability.
                 */
                show_log(opt, opt->diffopt.msg_sep);
-               if (opt->verbose_header &&
+               if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
+                   opt->verbose_header &&
                    opt->commit_format != CMIT_FMT_ONELINE) {
                        int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
                        if ((pch & opt->diffopt.output_format) == pch)