gitweb: Change the name of diff to parent link in "commit" view to "diff

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7f6bdaa951114e6fd1e07b9768a43f4eab229c61..2b40aa11e7a56af788b42238d55258aff1d03b60 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1027,9 +1027,9 @@ sub parse_difftree_raw_line {
                }
        }
        # 'c512b523472485aef4fff9e57b229d9d243c967f'
-       #elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
-       #       $res{'commit'} = $1;
-       #}
+       elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
+               $res{'commit'} = $1;
+       }
 
        return wantarray ? %res : \%res;
 }
@@ -2251,7 +2251,8 @@ sub git_blame2 {
        my $fd;
        my $ftype;
 
-       if (!gitweb_check_feature('blame')) {
+       my ($have_blame) = gitweb_check_feature('blame');
+       if (!$have_blame) {
                die_error('403 Permission denied', "Permission denied");
        }
        die_error('404 Not Found', "File name not defined") if (!$file_name);
@@ -2320,7 +2321,8 @@ sub git_blame2 {
 sub git_blame {
        my $fd;
 
-       if (!gitweb_check_feature('blame')) {
+       my ($have_blame) = gitweb_check_feature('blame');
+       if (!$have_blame) {
                die_error('403 Permission denied', "Permission denied");
        }
        die_error('404 Not Found', "File name not defined") if (!$file_name);
@@ -2494,7 +2496,7 @@ sub git_blob {
                        die_error(undef, "No file name defined");
                }
        }
-       my $have_blame = gitweb_check_feature('blame');
+       my ($have_blame) = gitweb_check_feature('blame');
        open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                or die_error(undef, "Couldn't cat $file_name, $hash");
        my $mimetype = blob_mimetype($fd, $file_name);
@@ -2570,7 +2572,7 @@ sub git_tree {
        my $ref = format_ref_marker($refs, $hash_base);
        git_header_html();
        my $base = "";
-       my $have_blame = gitweb_check_feature('blame');
+       my ($have_blame) = gitweb_check_feature('blame');
        if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                git_print_page_nav('tree','', $hash_base);
                git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
@@ -2779,7 +2781,7 @@ sub git_commit {
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
                      " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "commitdiff") .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "diff") .
                      "</td>" .
                      "</tr>\n";
        }