Skip to content

Commit

Permalink
gitweb: No difftree output for trivial merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Narebski authored and Junio C Hamano committed Sep 24, 2007
1 parent 711fa74 commit 3ef408a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down

0 comments on commit 3ef408a

Please sign in to comment.