cherry-pick: add t3512 for submodule updates

diff --git a/combine-diff.c b/combine-diff.c
index 12764fb733f3ca57f12c7fc567eec02d234c889e..f9975d2c2ebc83e8ecfc953c8df907fbff7858f5 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1396,7 +1396,8 @@ void diff_tree_combined(const unsigned char *sha1,
        if (show_log_first) {
                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);
        }