From d6db01075b65da2b8584a0450619390893aae103 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 21 May 2005 15:42:53 -0700 Subject: [PATCH] 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-tree.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/diff-tree.c b/diff-tree.c index 73aa1496e..68186484b 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; -- 2.30.2