gitweb: No difftree output for trivial merge

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 1c0fe8b3b08e2eb354da187e35e6373c69cfbc4a85b060fe08f5f0fd3b89d23e..d8b8dee18ed012c55fb219feca4f866e933c62e6bf0fc9bdc34b11cd0d9c52d2 100755 (executable)
--- 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
              "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" .
        if ($has_header) {
                # table header
                print "<thead><tr>\n" .