From: Jakub Narebski <redacted>
Date: Sat, 8 Sep 2007 19:54:28 +0000 (+0200)
Subject: gitweb: No difftree output for trivial merge
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/1fc5c0752801112163ed303c27e194b25c4fc1ff6ea79cfa555d4672eeff3c9e

gitweb: No difftree output for trivial merge

In 'commitdiff' view, for the merge commit, there is an extra header
for the difftree table, with links to commitdiffs to individual
parents.  Do not show such header when there is nothing to show, for
trivial merges.

This means that for trivial merge you have to go to 'commit' view
to get links to diffs to each parent.

Signed-off-by: Jakub Narebski <redacted>
---

diff --git a/gitweb.perl b/gitweb.perl
index 1c0fe8b..d8b8dee 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2810,7 +2810,7 @@ sub git_difftree_body {
 	      "diff_tree\">\n";
 
 	# header only for combined diff in 'commitdiff' view
-	my $has_header = @parents > 1 && $action eq 'commitdiff';
+	my $has_header = @$difftree && @parents > 1 && $action eq 'commitdiff';
 	if ($has_header) {
 		# table header
 		print "<thead><tr>\n" .