@matheusbsbs / matheus-bagliano / commits / 3ef408aefe
Fork 0

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>

Jakub Narebski committed Sep 8, 2007 at 21:54 UTC 3ef408aefe937fe76559e9b41602cddc0ac8af8c
1 file changed +1 -1
gitweb/gitweb.perl
+1 -1
@@ -2809,7 +2809,7 @@ sub git_difftree_body {
2809 "diff_tree\">\n";
2810
2811 # header only for combined diff in 'commitdiff' view
2812 - my $has_header = @parents > 1 && $action eq 'commitdiff';
2812 + my $has_header = @$difftree && @parents > 1 && $action eq 'commitdiff';
2813 if ($has_header) {
2814 # table header
2815 print "<thead><tr>\n" .