diff options
| -rw-r--r-- | diff-tree.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index 73aa1496e8..68186484b1 100644 --- 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; |