Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint

diff --git a/combine-diff.c b/combine-diff.c
index 24ca7e2334b68e06afd24051ad1aafcc129bcba4..fd6d63c703062e00ff77ce4de53e35a93e1e6e4d 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1339,7 +1339,8 @@ void diff_tree_combined(const unsigned char *sha1,
                if (show_log_first && i == 0) {
                        show_log(rev);
 
-                       if (rev->verbose_header && opt->output_format)
+                       if (rev->verbose_header && opt->output_format &&
+                           opt->output_format != DIFF_FORMAT_NO_OUTPUT)
                                printf("%s%c", diff_line_prefix(opt),
                                       opt->line_termination);
                }