resolve textual hashes when looking up "refs"

diff --git a/gitweb.cgi b/gitweb.cgi
index 1f5a409bf1fefc3d3fcaab8a3b17c25899a42d28..1814f7f2b3784a61e40cf04fa72cdfd2218de22e 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -17,7 +17,7 @@ use Fcntl ':mode';
 binmode STDOUT, ':utf8';
 
 my $cgi = new CGI;
-my $version =          "260";
+my $version =          "262";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link =         "";
@@ -260,7 +260,10 @@ sub git_header_html {
 <title>$title</title>
 $rss_link
 <style type="text/css">
-body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
+body {
+       font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px;
+       margin:10px; background-color:#ffffff; color:#000000;
+}
 a { color:#0000cc; }
 a:hover, a:visited, a:active { color:#880000; }
 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
@@ -531,6 +534,7 @@ sub git_read_commit {
        };
 
        foreach my $title (@commit_lines) {
+               $title =~ s/^    //;
                if ($title ne "") {
                        $co{'title'} = chop_str($title, 80, 5);
                        # remove leading stuff of merges to make the interesting part visible
@@ -912,6 +916,7 @@ sub read_info_ref {
        # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
        open my $fd, "$projectroot/$project/info/refs" or return;
        while (my $line = <$fd>) {
+               chomp($line);
                if ($line =~ m/^([0-9a-fA-F]{40})\t.*$type\/([^\^]+)/) {
                        if (defined $refs{$1}) {
                                $refs{$1} .= " / $2";
@@ -1702,8 +1707,8 @@ sub git_commit {
        }
        my $refs = read_info_ref();
        my $ref = "";
-       if (defined $refs->{$hash}) {
-               $ref = " <span class=\"tag\">" . esc_html($refs->{$hash}) . "</span>";
+       if (defined $refs->{$co{'id'}}) {
+               $ref = " <span class=\"tag\">" . esc_html($refs->{$co{'id'}}) . "</span>";
        }
        git_header_html(undef, $expires);
        print "<div class=\"page_nav\">\n" .
@@ -1944,8 +1949,8 @@ sub git_commitdiff {
        }
        my $refs = read_info_ref();
        my $ref = "";
-       if (defined $refs->{$hash}) {
-               $ref = " <span class=\"tag\">" . esc_html($refs->{$hash}) . "</span>";
+       if (defined $refs->{$co{'id'}}) {
+               $ref = " <span class=\"tag\">" . esc_html($refs->{$co{'id'}}) . "</span>";
        }
        git_header_html(undef, $expires);
        print "<div class=\"page_nav\">\n" .
@@ -2056,7 +2061,7 @@ sub git_commitdiff_plain {
              "\n";
 
        foreach my $line (@$comment) {;
-               print "  $line\n";
+               print "$line\n";
        }
        print "---\n\n";