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>
This commit is contained in:
Jakub Narebski 2007-09-08 21:54:28 +02:00 коммит произвёл Junio C Hamano
Родитель 711fa74266
Коммит 3ef408aefe
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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" .