diff --git a/log-tree.c b/log-tree.c
index 3e5e6acfafb5345b8ed4f67599270e841b194ade..62edd344558049f05c33888de9d2fc2a854b51e9 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
if (opt->show_log_size)
printf("log size %i\n", (int)msgbuf.len);
- printf("%s%s%s", msgbuf.buf, extra, sep);
+ if (msgbuf.len)
+ printf("%s%s%s", msgbuf.buf, extra, sep);
strbuf_release(&msgbuf);
}
* 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)