From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 8 Sep 2007 19:54:28 +0000 (+0200)
Subject: gitweb: No difftree output for trivial merge
X-Git-Tag: v1.5.3.3~12^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3ef408aefe937fe76559e9b41602cddc0ac8af8c;p=git.git

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 <jnareb@gmail.com>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index c18339f13..3064298f2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2809,7 +2809,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" .