gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3)

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

index 59f41b0243a962bc5033a991fa8ff7d4396353ea5e830079fc7dac781d990c19..2dc836f7109dc2e765f8e65c369d0dad0fa41a545942764a51cd2a816683df7f 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -592,7 +592,7 @@ sub esc_html ($;%) {
         my %opts = @_;
  
         $str = to_utf8($str);
         my %opts = @_;
  
         $str = to_utf8($str);
-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
@@ -606,7 +606,7 @@ sub esc_path {
         my %opts = @_;
  
         $str = to_utf8($str);
         my %opts = @_;
  
         $str = to_utf8($str);
-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
@@ -835,7 +835,7 @@ sub file_type_long {
  
  ## ----------------------------------------------------------------------
  ## functions returning short HTML fragments, or transforming HTML fragments
  
  ## ----------------------------------------------------------------------
  ## functions returning short HTML fragments, or transforming HTML fragments
-## which don't beling to other sections
+## which don't belong to other sections
  
  # format line of commit message.
  sub format_log_line_html {
  
  # format line of commit message.
  sub format_log_line_html {
@@ -987,7 +987,7 @@ sub git_get_project_config {
         $key =~ s/^gitweb\.//;
         return if ($key =~ m/\W/);
  
         $key =~ s/^gitweb\.//;
         return if ($key =~ m/\W/);
  
-       my @x = (git_cmd(), 'repo-config');
+       my @x = (git_cmd(), 'config');
         if (defined $type) { push @x, $type; }
         push @x, "--get";
         push @x, "gitweb.$key";
         if (defined $type) { push @x, $type; }
         push @x, "--get";
         push @x, "gitweb.$key";
@@ -1691,7 +1691,7 @@ sub git_header_html {
  
         my $title = "$site_name";
         if (defined $project) {
  
         my $title = "$site_name";
         if (defined $project) {
-               $title .= " - $project";
+               $title .= " - " . to_utf8($project);
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
@@ -1801,7 +1801,7 @@ EOF
                       $cgi->hidden(-name => "a") . "\n" .
                       $cgi->hidden(-name => "h") . "\n" .
                       $cgi->popup_menu(-name => 'st', -default => 'commit',
                       $cgi->hidden(-name => "a") . "\n" .
                       $cgi->hidden(-name => "h") . "\n" .
                       $cgi->popup_menu(-name => 'st', -default => 'commit',
-                                      -values => ['commit', 'author', 'committer', 'pickaxe']) .
+                                      -values => ['commit', 'author', 'committer', 'pickaxe']) .
                       $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
                       " search:\n",
                       $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
                       $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
                       " search:\n",
                       $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
@@ -1964,7 +1964,7 @@ sub git_print_page_path {
  
         print "<div class=\"page_path\">";
         print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
  
         print "<div class=\"page_path\">";
         print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
-                     -title => 'tree root'}, "[$project]");
+                     -title => 'tree root'}, to_utf8("[$project]"));
         print " / ";
         if (defined $name) {
                 my @dirname = split '/', $name;
         print " / ";
         if (defined $name) {
                 my @dirname = split '/', $name;
@@ -1975,17 +1975,17 @@ sub git_print_page_path {
                         $fullname .= ($fullname ? '/' : '') . $dir;
                         print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                      hash_base=>$hb),
                         $fullname .= ($fullname ? '/' : '') . $dir;
                         print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                      hash_base=>$hb),
-                                     -title => esc_html($fullname)}, esc_path($dir));
+                                     -title => $fullname}, esc_path($dir));
                         print " / ";
                 }
                 if (defined $type && $type eq 'blob') {
                         print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                      hash_base=>$hb),
                         print " / ";
                 }
                 if (defined $type && $type eq 'blob') {
                         print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                      hash_base=>$hb),
-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));
                 } elsif (defined $type && $type eq 'tree') {
                         print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                      hash_base=>$hb),
                 } elsif (defined $type && $type eq 'tree') {
                         print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                      hash_base=>$hb),
-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));
                         print " / ";
                 } else {
                         print esc_path($basename);
                         print " / ";
                 } else {
                         print esc_path($basename);
@@ -2240,7 +2240,7 @@ sub git_difftree_body {
                         }
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'})},
                         }
                         print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob") . " | ";
+                                     "blob");
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
@@ -2275,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";
                         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)) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
                                 }
                                 if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
@@ -2379,7 +2379,6 @@ sub git_patchset_body {
         my $patch_line;
         my $diffinfo;
         my (%from, %to);
         my $patch_line;
         my $diffinfo;
         my (%from, %to);
-       my ($from_id, $to_id);
  
         print "<div class=\"patchset\">\n";
  
  
         print "<div class=\"patchset\">\n";
  
@@ -2393,6 +2392,7 @@ sub git_patchset_body {
   PATCH:
         while ($patch_line) {
                 my @diff_header;
   PATCH:
         while ($patch_line) {
                 my @diff_header;
+               my ($from_id, $to_id);
  
                 # git diff header
                 #assert($patch_line =~ m/^diff /) if DEBUG;
  
                 # git diff header
                 #assert($patch_line =~ m/^diff /) if DEBUG;
@@ -2404,7 +2404,7 @@ sub git_patchset_body {
                 while ($patch_line = <$fd>) {
                         chomp $patch_line;
  
                 while ($patch_line = <$fd>) {
                         chomp $patch_line;
  
-                       last EXTENDED_HEADER if ($patch_line =~ m/^--- /);
+                       last EXTENDED_HEADER if ($patch_line =~ m/^--- |^diff /);
  
                         if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
                                 $from_id = $1;
  
                         if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
                                 $from_id = $1;
@@ -2413,7 +2413,6 @@ sub git_patchset_body {
  
                         push @diff_header, $patch_line;
                 }
  
                         push @diff_header, $patch_line;
                 }
-               #last PATCH unless $patch_line;
                 my $last_patch_line = $patch_line;
  
                 # check if current patch belong to current raw line
                 my $last_patch_line = $patch_line;
  
                 # check if current patch belong to current raw line
@@ -2440,11 +2439,15 @@ sub git_patchset_body {
                                 $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
                                                      hash=>$diffinfo->{'from_id'},
                                                      file_name=>$from{'file'});
                                 $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'});
                         }
                         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
                         }
                         # this is first patch for raw difftree line with $patch_idx index
                         # we index @$difftree array from 0, but number patches from 1
@@ -2476,11 +2479,11 @@ sub git_patchset_body {
                         # match <path>
                         if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                 $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
                         # match <path>
                         if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                 $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
-                                                       esc_path($from{'file'}));
+                                                      esc_path($from{'file'}));
                         }
                         if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
                         }
                         if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
-                               $patch_line = $cgi->a({-href=>$to{'href'}, -class=>"path"},
-                                                     esc_path($to{'file'}));
+                               $patch_line .= $cgi->a({-href=>$to{'href'}, -class=>"path"},
+                                                      esc_path($to{'file'}));
                         }
                         # match <mode>
                         if ($patch_line =~ m/\s(\d{6})$/) {
                         }
                         # match <mode>
                         if ($patch_line =~ m/\s(\d{6})$/) {
@@ -2519,8 +2522,13 @@ sub git_patchset_body {
  
                 # from-file/to-file diff header
                 $patch_line = $last_patch_line;
  
                 # from-file/to-file diff header
                 $patch_line = $last_patch_line;
+               if (! $patch_line) {
+                       print "</div>\n"; # class="patch"
+                       last PATCH;
+               }
+               next PATCH if ($patch_line =~ m/^diff /);
                 #assert($patch_line =~ m/^---/) if DEBUG;
                 #assert($patch_line =~ m/^---/) if DEBUG;
-               if ($from{'href'}) {
+               if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
                         $patch_line = '--- a/' .
                                       $cgi->a({-href=>$from{'href'}, -class=>"path"},
                                               esc_path($from{'file'}));
                         $patch_line = '--- a/' .
                                       $cgi->a({-href=>$from{'href'}, -class=>"path"},
                                               esc_path($from{'file'}));
@@ -2528,11 +2536,10 @@ sub git_patchset_body {
                 print "<div class=\"diff from_file\">$patch_line</div>\n";
  
                 $patch_line = <$fd>;
                 print "<div class=\"diff from_file\">$patch_line</div>\n";
  
                 $patch_line = <$fd>;
-               #last PATCH unless $patch_line;
                 chomp $patch_line;
  
                 #assert($patch_line =~ m/^+++/) if DEBUG;
                 chomp $patch_line;
  
                 #assert($patch_line =~ m/^+++/) if DEBUG;
-               if ($to{'href'}) {
+               if ($to{'href'} && $patch_line =~ m!^\+\+\+ "?b/!) {
                         $patch_line = '+++ b/' .
                                       $cgi->a({-href=>$to{'href'}, -class=>"path"},
                                               esc_path($to{'file'}));
                         $patch_line = '+++ b/' .
                                       $cgi->a({-href=>$to{'href'}, -class=>"path"},
                                               esc_path($to{'file'}));
@@ -2814,8 +2821,12 @@ sub git_tags_body {
                         print "<tr class=\"light\">\n";
                 }
                 $alternate ^= 1;
                         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" .
                       $cgi->a({-href => href(action=>$tag{'reftype'}, hash=>$tag{'refid'}),
                                -class => "list name"}, esc_html($tag{'name'})) .
                       "</td>\n" .
@@ -2996,7 +3007,7 @@ sub git_project_index {
  
         foreach my $pr (@projects) {
                 if (!exists $pr->{'owner'}) {
  
         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'});
                 }
  
                 my ($path, $owner) = ($pr->{'path'}, $pr->{'owner'});
@@ -3085,7 +3096,7 @@ sub git_summary {
                 git_project_list_body(\@forklist, undef, 0, 15,
                                       $#forklist <= 15 ? undef :
                                       $cgi->a({-href => href(action=>"forks")}, "..."),
                 git_project_list_body(\@forklist, undef, 0, 15,
                                       $#forklist <= 15 ? undef :
                                       $cgi->a({-href => href(action=>"forks")}, "..."),
-                                     'noheader');
+                                     'noheader');
         }
  
         git_footer_html();
         }
  
         git_footer_html();
@@ -3144,7 +3155,7 @@ sub git_blame2 {
         }
         $ftype = git_get_type($hash);
         if ($ftype !~ "blob") {
         }
         $ftype = git_get_type($hash);
         if ($ftype !~ "blob") {
-               die_error("400 Bad Request", "Object is not a blob");
+               die_error('400 Bad Request', "Object is not a blob");
         }
         open ($fd, "-|", git_cmd(), "blame", '-p', '--',
               $file_name, $hash_base)
         }
         open ($fd, "-|", git_cmd(), "blame", '-p', '--',
               $file_name, $hash_base)
@@ -3192,7 +3203,7 @@ HTML
                 my $rev = substr($full_rev, 0, 8);
                 my $author = $meta->{'author'};
                 my %date = parse_date($meta->{'author-time'},
                 my $rev = substr($full_rev, 0, 8);
                 my $author = $meta->{'author'};
                 my %date = parse_date($meta->{'author-time'},
-                                     $meta->{'author-tz'});
+                                     $meta->{'author-tz'});
                 my $date = $date{'iso-tz'};
                 if ($group_size) {
                         $current_color = ++$current_color % $num_colors;
                 my $date = $date{'iso-tz'};
                 if ($group_size) {
                         $current_color = ++$current_color % $num_colors;
@@ -3204,19 +3215,24 @@ HTML
                         print " rowspan=\"$group_size\"" if ($group_size > 1);
                         print ">";
                         print $cgi->a({-href => href(action=>"commit",
                         print " rowspan=\"$group_size\"" if ($group_size > 1);
                         print ">";
                         print $cgi->a({-href => href(action=>"commit",
-                                                    hash=>$full_rev,
-                                                    file_name=>$file_name)},
-                                     esc_html($rev));
+                                                    hash=>$full_rev,
+                                                    file_name=>$file_name)},
+                                     esc_html($rev));
                         print "</td>\n";
                 }
                         print "</td>\n";
                 }
+               open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")
+                       or die_error(undef, "Open git-rev-parse failed");
+               my $parent_commit = <$dd>;
+               close $dd;
+               chomp($parent_commit);
                 my $blamed = href(action => 'blame',
                 my $blamed = href(action => 'blame',
-                                 file_name => $meta->{'filename'},
-                                 hash_base => $full_rev);
+                                 file_name => $meta->{'filename'},
+                                 hash_base => $parent_commit);
                 print "<td class=\"linenr\">";
                 print $cgi->a({ -href => "$blamed#l$orig_lineno",
                 print "<td class=\"linenr\">";
                 print $cgi->a({ -href => "$blamed#l$orig_lineno",
-                               -id => "l$lineno",
-                               -class => "linenr" },
-                             esc_html($lineno));
+                               -id => "l$lineno",
+                               -class => "linenr" },
+                             esc_html($lineno));
                 print "</td>";
                 print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                 print "</tr>\n";
                 print "</td>";
                 print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                 print "</tr>\n";
@@ -3595,7 +3611,7 @@ sub git_snapshot {
                 $hash = git_get_head_hash($project);
         }
  
                 $hash = git_get_head_hash($project);
         }
  
-       my $filename = basename($project) . "-$hash.tar.$suffix";
+       my $filename = to_utf8(basename($project)) . "-$hash.tar.$suffix";
  
         print $cgi->header(
                 -type => "application/$ctype",
  
         print $cgi->header(
                 -type => "application/$ctype",
@@ -3606,8 +3622,8 @@ sub git_snapshot {
         my $name = $project;
         $name =~ s/\047/\047\\\047\047/g;
         open my $fd, "-|",
         my $name = $project;
         $name =~ s/\047/\047\\\047\047/g;
         open my $fd, "-|",
-       "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
-               or die_error(undef, "Execute git-tar-tree failed.");
+               "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
+               or die_error(undef, "Execute git-tar-tree failed");
         binmode STDOUT, ':raw';
         print <$fd>;
         binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
         binmode STDOUT, ':raw';
         print <$fd>;
         binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
@@ -3704,7 +3720,7 @@ sub git_commit {
                 $formats_nav .=
                         '(merge: ' .
                         join(' ', map {
                 $formats_nav .=
                         '(merge: ' .
                         join(' ', map {
-                               $cgi->a({-href => href(action=>"commitdiff",
+                               $cgi->a({-href => href(action=>"commit",
                                                        hash=>$_)},
                                         esc_html(substr($_, 0, 7)));
                         } @$parents ) .
                                                        hash=>$_)},
                                         esc_html(substr($_, 0, 7)));
                         } @$parents ) .
@@ -3719,7 +3735,7 @@ sub git_commit {
                 # difftree output is not printed for merges
                 open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
                         @diff_opts, $parent, $hash, "--"
                 # difftree output is not printed for merges
                 open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
                         @diff_opts, $parent, $hash, "--"
-                               or die_error(undef, "Open git-diff-tree failed");
+                       or die_error(undef, "Open git-diff-tree failed");
                 @difftree = map { chomp; $_ } <$fd>;
                 close $fd or die_error(undef, "Reading git-diff-tree failed");
         }
                 @difftree = map { chomp; $_ } <$fd>;
                 close $fd or die_error(undef, "Reading git-diff-tree failed");
         }
@@ -3870,7 +3886,7 @@ sub git_blobdiff {
                         # read raw output
                         open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                                 $hash_parent_base, $hash_base,
                         # read raw output
                         open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                                 $hash_parent_base, $hash_base,
-                               "--", $file_name
+                               "--", (defined $file_parent ? $file_parent : ()), $file_name
                                 or die_error(undef, "Open git-diff-tree failed");
                         @difftree = map { chomp; $_ } <$fd>;
                         close $fd
                                 or die_error(undef, "Open git-diff-tree failed");
                         @difftree = map { chomp; $_ } <$fd>;
                         close $fd
@@ -3920,7 +3936,7 @@ sub git_blobdiff {
                 # open patch output
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                         '-p', $hash_parent_base, $hash_base,
                 # open patch output
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                         '-p', $hash_parent_base, $hash_base,
-                       "--", $file_name
+                       "--", (defined $file_parent ? $file_parent : ()), $file_name
                         or die_error(undef, "Open git-diff-tree failed");
         }
  
                         or die_error(undef, "Open git-diff-tree failed");
         }
  
@@ -4289,13 +4305,13 @@ sub git_search {
                 if ($page > 0) {
                         $paging_nav .=
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
                 if ($page > 0) {
                         $paging_nav .=
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
-                                                      searchtext=>$searchtext, searchtype=>$searchtype)},
-                                       "first");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype)},
+                                       "first");
                         $paging_nav .= " &sdot; " .
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
                         $paging_nav .= " &sdot; " .
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
-                                                      searchtext=>$searchtext, searchtype=>$searchtype,
-                                                      page=>$page-1),
-                                        -accesskey => "p", -title => "Alt-p"}, "prev");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page-1),
+                                        -accesskey => "p", -title => "Alt-p"}, "prev");
                 } else {
                         $paging_nav .= "first";
                         $paging_nav .= " &sdot; prev";
                 } else {
                         $paging_nav .= "first";
                         $paging_nav .= " &sdot; prev";
@@ -4303,9 +4319,9 @@ sub git_search {
                 if ($#commitlist >= 100) {
                         $paging_nav .= " &sdot; " .
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
                 if ($#commitlist >= 100) {
                         $paging_nav .= " &sdot; " .
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
-                                                      searchtext=>$searchtext, searchtype=>$searchtype,
-                                                      page=>$page+1),
-                                        -accesskey => "n", -title => "Alt-n"}, "next");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page+1),
+                                        -accesskey => "n", -title => "Alt-n"}, "next");
                 } else {
                         $paging_nav .= " &sdot; next";
                 }
                 } else {
                         $paging_nav .= " &sdot; next";
                 }
@@ -4313,9 +4329,9 @@ sub git_search {
                 if ($#commitlist >= 100) {
                         $next_link =
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
                 if ($#commitlist >= 100) {
                         $next_link =
                                 $cgi->a({-href => href(action=>"search", hash=>$hash,
-                                                      searchtext=>$searchtext, searchtype=>$searchtype,
-                                                      page=>$page+1),
-                                        -accesskey => "n", -title => "Alt-n"}, "next");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page+1),
+                                        -accesskey => "n", -title => "Alt-n"}, "next");
                 }
  
                 git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
                 }
  
                 git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
@@ -4424,7 +4440,7 @@ sub git_shortlog {
         }
         my $refs = git_get_references();
  
         }
         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 = '';
  
         my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, (100 * ($page+1)));
         my $next_link = '';