gitweb: Protect against possible warning in git_commitdiff

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index ab5fefa2008ba407f729e08b9bfde1da38d8c37bfb8a47b7e18cab21d538ef52..aea8856a71c8990dbf2d1ada1cb93bf4deb8b836c2e6acd991a3ad103404c8ca 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -815,12 +815,11 @@ sub file_type_long {
 ## functions returning short HTML fragments, or transforming HTML fragments
 ## which don't beling to other sections
 
-# format line of commit message or tag comment
+# format line of commit message.
 sub format_log_line_html {
        my $line = shift;
 
-       $line = esc_html($line);
-       $line =~ s/ / /g;
+       $line = esc_html($line, -nbsp=>1);
        if ($line =~ m/([0-9a-fA-F]{40})/) {
                my $hash_text = $1;
                if (git_get_type($hash_text) eq "commit") {
@@ -2340,6 +2339,8 @@ sub git_patchset_body {
 
                print format_diff_line($patch_line);
        }
+       print "</div>\n" if $in_header; # extended header
+
        print "</div>\n" if $patch_found; # class="patch"
 
        print "</div>\n"; # class="patchset"
@@ -2454,7 +2455,7 @@ sub git_project_list_body {
                      $pr->{'age_string'} . "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary")}, "summary")   . " | " .
-                     $cgi->a({-href => '/git-browser/by-commit.html?r='.$pr->{'path'}}, "graphiclog") . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"shortlog")}, "shortlog") . " | " .
                      $cgi->a({-href => href(project=>$pr->{'path'}, action=>"log")}, "log") . " | " .
                      $cgi->a({-href => href(project=>$pr->{'path'}, action=>"tree")}, "tree") .
                      ($pr->{'forks'} ? " | " . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"forks")}, "forks") : '') .
@@ -3731,7 +3732,8 @@ sub git_commitdiff {
                        $hash_parent, $hash, "--"
                        or die_error(undef, "Open git-diff-tree failed");
 
-               while (chomp(my $line = <$fd>)) {
+               while (my $line = <$fd>) {
+                       chomp $line;
                        # empty line ends raw part of diff-tree output
                        last unless $line;
                        push @difftree, $line;