pretty: make empty userformats truly empty

diff --git a/combine-diff.c b/combine-diff.c
index f9975d2c2ebc83e8ecfc953c8df907fbff7858f5..1a1e6598e242f28106b3b371efa3d4c09fa13cfe 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1397,7 +1397,8 @@ void diff_tree_combined(const unsigned char *sha1,
                show_log(rev);
 
                if (rev->verbose_header && opt->output_format &&
-                   opt->output_format != DIFF_FORMAT_NO_OUTPUT)
+                   opt->output_format != DIFF_FORMAT_NO_OUTPUT &&
+                   !commit_format_is_empty(rev->commit_format))
                        printf("%s%c", diff_line_prefix(opt),
                               opt->line_termination);
        }