summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-09-08 21:54:28 +0200
committerJunio C Hamano <gitster@pobox.com>2007-09-23 23:12:22 -0700
commit3ef408aefe937fe76559e9b41602cddc0ac8af8c (patch)
tree84e83756b91c3042dcad03a4ec11857f95a36c1c /gitweb
parent711fa74266ebfaf58ee0cd79988748fbaa752538 (diff)
downloadgit-3ef408aefe937fe76559e9b41602cddc0ac8af8c.tar.gz
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>
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index c18339f131..3064298f28 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" .