gitweb: Fix error in git_patchest_body for file creation/deletion patch

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index 85197f51f7c6e4b67d93eb4be6a5b44b52706e900d87823cbdb3643099eb4f29..7d54919c9d0a3c09fb22c9eaf0caef555311fa009c569e745810c0659e4ca0b7 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -18,6 +18,10 @@ use File::Find qw();
  use File::Basename qw(basename);
  binmode STDOUT, ':utf8';
  
+BEGIN {
+       CGI->compile() if $ENV{MOD_PERL};
+}
+
  our $cgi = new CGI;
  our $version = "++GIT_VERSION++";
  our $my_url = $cgi->url();
@@ -1712,6 +1716,7 @@ sub git_header_html {
         }
         print $cgi->header(-type=>$content_type, -charset => 'utf-8',
                            -status=> $status, -expires => $expires);
+       my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
         print <<EOF;
  <?xml version="1.0" encoding="utf-8"?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -1720,7 +1725,7 @@ sub git_header_html {
  <!-- git core binaries version $git_version -->
  <head>
  <meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
-<meta name="generator" content="gitweb/$version git/$git_version"/>
+<meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>
  EOF
@@ -2270,7 +2275,7 @@ sub git_difftree_body {
                         my $mode_chnge = "";
                         if ($diff{'from_mode'} != $diff{'to_mode'}) {
                                 $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
-                               if ($from_file_type != $to_file_type) {
+                               if ($from_file_type ne $to_file_type) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
                                 }
                                 if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
@@ -2374,7 +2379,6 @@ sub git_patchset_body {
         my $patch_line;
         my $diffinfo;
         my (%from, %to);
-       my ($from_id, $to_id);
  
         print "<div class=\"patchset\">\n";
  
@@ -2388,6 +2392,7 @@ sub git_patchset_body {
   PATCH:
         while ($patch_line) {
                 my @diff_header;
+               my ($from_id, $to_id);
  
                 # git diff header
                 #assert($patch_line =~ m/^diff /) if DEBUG;
@@ -2435,11 +2440,15 @@ sub git_patchset_body {
                                 $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
                                                      hash=>$diffinfo->{'from_id'},
                                                      file_name=>$from{'file'});
+                       } else {
+                               delete $from{'href'};
                         }
                         if ($diffinfo->{'status'} ne "D") { # not deleted file
                                 $to{'href'} = href(action=>"blob", hash_base=>$hash,
                                                    hash=>$diffinfo->{'to_id'},
                                                    file_name=>$to{'file'});
+                       } else {
+                               delete $to{'href'};
                         }
                         # this is first patch for raw difftree line with $patch_idx index
                         # we index @$difftree array from 0, but number patches from 1
@@ -2523,7 +2532,7 @@ sub git_patchset_body {
                 print "<div class=\"diff from_file\">$patch_line</div>\n";
  
                 $patch_line = <$fd>;
-               #last PATCH unless $patch_line;
+               last PATCH unless $patch_line;
                 chomp $patch_line;
  
                 #assert($patch_line =~ m/^+++/) if DEBUG;
@@ -2809,8 +2818,12 @@ sub git_tags_body {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
-               print "<td><i>$tag{'age'}</i></td>\n" .
-                     "<td>" .
+               if (defined $tag{'age'}) {
+                       print "<td><i>$tag{'age'}</i></td>\n";
+               } else {
+                       print "<td></td>\n";
+               }
+               print "<td>" .
                       $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),
                                -class => "list name"}, esc_html($tag{'name'})) .
                       "</td>\n" .
@@ -2991,7 +3004,7 @@ sub git_project_index {
  
         foreach my $pr (@projects) {
                 if (!exists $pr->{'owner'}) {
-                       $pr->{'owner'} = get_file_owner("$projectroot/$project");
+                       $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}");
                 }
  
                 my ($path, $owner) = ($pr->{'path'}, $pr->{'owner'});
@@ -3204,9 +3217,14 @@ HTML
                                       esc_html($rev));
                         print "</td>\n";
                 }
+               open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")
+                       or die_error("could not open git-rev-parse");
+               my $parent_commit = <$dd>;
+               close $dd;
+               chomp($parent_commit);
                 my $blamed = href(action => 'blame',
                                   file_name => $meta->{'filename'},
-                                 hash_base => $full_rev);
+                                 hash_base => $parent_commit);
                 print "<td class=\"linenr\">";
                 print $cgi->a({ -href => "$blamed#l$orig_lineno",
                                 -id => "l$lineno",
@@ -4419,7 +4437,7 @@ sub git_shortlog {
         }
         my $refs = git_get_references();
  
-       my @commitlist = parse_commits($head, 101, (100 * $page));
+       my @commitlist = parse_commits($hash, 101, (100 * $page));
  
         my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, (100 * ($page+1)));
         my $next_link = '';