mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Normally we show every facet of a merge, but when we're silent,
there's little point.
This commit is contained in:
Linus Torvalds
2005-05-21 15:42:53 -07:00
parent 057c7d3018
commit d6db01075b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
diff-tree.c
View File

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