diff-tree: don't print multiple headers for merges when silent.

Normally we show every facet of a merge, but when we're silent,
there's little point.

diff --git a/diff-tree.c b/diff-tree.c
index 73aa1496e8d49606e6cd6ecd1d89c251ea293eba..68186484b14d8e3293d1436f772b59b0132d3287 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -414,8 +414,15 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
                        return -1;
                header = generate_header(name, sha1_to_hex(parent), buf, size);
                diff_tree_sha1_top(parent, commit, "");
-               if (!header && verbose_header)
+               if (!header && verbose_header) {
                        header_prefix = "\ndiff-tree ";
+                       /*
+                        * Don't print multiple merge entries if we
+                        * don't print the diffs.
+                        */
+                       if (silent)
+                               break;
+               }
                offset += 48;
        }
        return 0;