gitweb: make leftmost column of blame less cluttered.

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

old mode 100755 (executable)

new mode 100644 (file)

index a1ab955..8b6c0c3
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -54,6 +54,13 @@ our $favicon = "++GITWEB_FAVICON++";
  # source of projects list
  our $projects_list = "++GITWEB_LIST++";
  
  # source of projects list
  our $projects_list = "++GITWEB_LIST++";
  
+# show repository only if this file exists
+# (only effective if this variable evaluates to true)
+our $export_ok = "++GITWEB_EXPORT_OK++";
+
+# only allow viewing of repositories also shown on the overview page
+our $strict_export = "++GITWEB_STRICT_EXPORT++";
+
  # list of git base URLs used for URL to where fetch project from,
  # i.e. full URL is "$git_base_url/$project"
  our @git_base_url_list = ("++GITWEB_BASE_URL++");
  # list of git base URLs used for URL to where fetch project from,
  # i.e. full URL is "$git_base_url/$project"
  our @git_base_url_list = ("++GITWEB_BASE_URL++");
@@ -95,11 +102,15 @@ our %feature = (
                 'sub' => \&feature_pickaxe,
                 'override' => 0,
                 'default' => [1]},
                 'sub' => \&feature_pickaxe,
                 'override' => 0,
                 'default' => [1]},
+
+       'pathinfo' => {
+               'override' => 0,
+               'default' => [0]},
  );
  
  sub gitweb_check_feature {
         my ($name) = @_;
  );
  
  sub gitweb_check_feature {
         my ($name) = @_;
-       return undef unless exists $feature{$name};
+       return unless exists $feature{$name};
         my ($sub, $override, @defaults) = (
                 $feature{$name}{'sub'},
                 $feature{$name}{'override'},
         my ($sub, $override, @defaults) = (
                 $feature{$name}{'sub'},
                 $feature{$name}{'override'},
@@ -148,6 +159,13 @@ sub feature_snapshot {
         return ($ctype, $suffix, $command);
  }
  
         return ($ctype, $suffix, $command);
  }
  
+sub gitweb_have_snapshot {
+       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
+       my $have_snapshot = (defined $ctype && defined $suffix);
+
+       return $have_snapshot;
+}
+
  # To enable system wide have in $GITWEB_CONFIG
  # $feature{'pickaxe'}{'default'} = [1];
  # To have project specific config enable override in $GITWEB_CONFIG
  # To enable system wide have in $GITWEB_CONFIG
  # $feature{'pickaxe'}{'default'} = [1];
  # To have project specific config enable override in $GITWEB_CONFIG
@@ -182,9 +200,6 @@ do $GITWEB_CONFIG if -e $GITWEB_CONFIG;
  # version of the core git binary
  our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
  
  # version of the core git binary
  our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
  
-# path to the current git repository
-our $git_dir;
-
  $projects_list ||= $projectroot;
  
  # ======================================================================
  $projects_list ||= $projectroot;
  
  # ======================================================================
@@ -196,70 +211,66 @@ if (defined $action) {
         }
  }
  
         }
  }
  
-our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
-if (defined $project) {
-       $project =~ s|^/||;
-       $project =~ s|/$||;
-       $project = undef unless $project;
-}
+# parameters which are pathnames
+our $project = $cgi->param('p');
  if (defined $project) {
  if (defined $project) {
-       if (!validate_input($project)) {
-               die_error(undef, "Invalid project parameter");
-       }
-       if (!(-d "$projectroot/$project")) {
-               die_error(undef, "No such directory");
-       }
-       if (!(-e "$projectroot/$project/HEAD")) {
+       if (!validate_pathname($project) ||
+           !(-d "$projectroot/$project") ||
+           !(-e "$projectroot/$project/HEAD") ||
+           ($export_ok && !(-e "$projectroot/$project/$export_ok")) ||
+           ($strict_export && !project_in_list($project))) {
+               undef $project;
                 die_error(undef, "No such project");
         }
                 die_error(undef, "No such project");
         }
-       $git_dir = "$projectroot/$project";
  }
  
  our $file_name = $cgi->param('f');
  if (defined $file_name) {
  }
  
  our $file_name = $cgi->param('f');
  if (defined $file_name) {
-       if (!validate_input($file_name)) {
+       if (!validate_pathname($file_name)) {
                 die_error(undef, "Invalid file parameter");
         }
  }
  
  our $file_parent = $cgi->param('fp');
  if (defined $file_parent) {
                 die_error(undef, "Invalid file parameter");
         }
  }
  
  our $file_parent = $cgi->param('fp');
  if (defined $file_parent) {
-       if (!validate_input($file_parent)) {
+       if (!validate_pathname($file_parent)) {
                 die_error(undef, "Invalid file parent parameter");
         }
  }
  
                 die_error(undef, "Invalid file parent parameter");
         }
  }
  
+# parameters which are refnames
  our $hash = $cgi->param('h');
  if (defined $hash) {
  our $hash = $cgi->param('h');
  if (defined $hash) {
-       if (!validate_input($hash)) {
+       if (!validate_refname($hash)) {
                 die_error(undef, "Invalid hash parameter");
         }
  }
  
  our $hash_parent = $cgi->param('hp');
  if (defined $hash_parent) {
                 die_error(undef, "Invalid hash parameter");
         }
  }
  
  our $hash_parent = $cgi->param('hp');
  if (defined $hash_parent) {
-       if (!validate_input($hash_parent)) {
+       if (!validate_refname($hash_parent)) {
                 die_error(undef, "Invalid hash parent parameter");
         }
  }
  
  our $hash_base = $cgi->param('hb');
  if (defined $hash_base) {
                 die_error(undef, "Invalid hash parent parameter");
         }
  }
  
  our $hash_base = $cgi->param('hb');
  if (defined $hash_base) {
-       if (!validate_input($hash_base)) {
+       if (!validate_refname($hash_base)) {
                 die_error(undef, "Invalid hash base parameter");
         }
  }
  
  our $hash_parent_base = $cgi->param('hpb');
  if (defined $hash_parent_base) {
                 die_error(undef, "Invalid hash base parameter");
         }
  }
  
  our $hash_parent_base = $cgi->param('hpb');
  if (defined $hash_parent_base) {
-       if (!validate_input($hash_parent_base)) {
+       if (!validate_refname($hash_parent_base)) {
                 die_error(undef, "Invalid hash parent base parameter");
         }
  }
  
                 die_error(undef, "Invalid hash parent base parameter");
         }
  }
  
+# other parameters
  our $page = $cgi->param('pg');
  if (defined $page) {
  our $page = $cgi->param('pg');
  if (defined $page) {
-       if ($page =~ m/[^0-9]$/) {
+       if ($page =~ m/[^0-9]/) {
                 die_error(undef, "Invalid page parameter");
         }
  }
                 die_error(undef, "Invalid page parameter");
         }
  }
@@ -272,6 +283,55 @@ if (defined $searchtext) {
         $searchtext = quotemeta $searchtext;
  }
  
         $searchtext = quotemeta $searchtext;
  }
  
+# now read PATH_INFO and use it as alternative to parameters
+sub evaluate_path_info {
+       return if defined $project;
+       my $path_info = $ENV{"PATH_INFO"};
+       return if !$path_info;
+       $path_info =~ s,^/+,,;
+       return if !$path_info;
+       # find which part of PATH_INFO is project
+       $project = $path_info;
+       $project =~ s,/+$,,;
+       while ($project && !-e "$projectroot/$project/HEAD") {
+               $project =~ s,/*[^/]*$,,;
+       }
+       # validate project
+       $project = validate_pathname($project);
+       if (!$project ||
+           ($export_ok && !-e "$projectroot/$project/$export_ok") ||
+           ($strict_export && !project_in_list($project))) {
+               undef $project;
+               return;
+       }
+       # do not change any parameters if an action is given using the query string
+       return if $action;
+       $path_info =~ s,^$project/*,,;
+       my ($refname, $pathname) = split(/:/, $path_info, 2);
+       if (defined $pathname) {
+               # we got "project.git/branch:filename" or "project.git/branch:dir/"
+               # we could use git_get_type(branch:pathname), but it needs $git_dir
+               $pathname =~ s,^/+,,;
+               if (!$pathname || substr($pathname, -1) eq "/") {
+                       $action  ||= "tree";
+                       $pathname =~ s,/$,,;
+               } else {
+                       $action  ||= "blob_plain";
+               }
+               $hash_base ||= validate_refname($refname);
+               $file_name ||= validate_pathname($pathname);
+       } elsif (defined $refname) {
+               # we got "project.git/branch"
+               $action ||= "shortlog";
+               $hash   ||= validate_refname($refname);
+       }
+}
+evaluate_path_info();
+
+# path to the current git repository
+our $git_dir;
+$git_dir = "$projectroot/$project" if $project;
+
  # dispatch
  my %actions = (
         "blame" => \&git_blame2,
  # dispatch
  my %actions = (
         "blame" => \&git_blame2,
@@ -307,6 +367,10 @@ if (defined $project) {
  if (!defined($actions{$action})) {
         die_error(undef, "Unknown action");
  }
  if (!defined($actions{$action})) {
         die_error(undef, "Unknown action");
  }
+if ($action !~ m/^(opml|project_list|project_index)$/ &&
+    !$project) {
+       die_error(undef, "Project needed");
+}
  $actions{$action}->();
  exit;
  
  $actions{$action}->();
  exit;
  
@@ -315,6 +379,7 @@ exit;
  
  sub href(%) {
         my %params = @_;
  
  sub href(%) {
         my %params = @_;
+       my $href = $my_uri;
  
         my @mapping = (
                 project => "p",
  
         my @mapping = (
                 project => "p",
@@ -333,6 +398,19 @@ sub href(%) {
  
         $params{'project'} = $project unless exists $params{'project'};
  
  
         $params{'project'} = $project unless exists $params{'project'};
  
+       my ($use_pathinfo) = gitweb_check_feature('pathinfo');
+       if ($use_pathinfo) {
+               # use PATH_INFO for project name
+               $href .= "/$params{'project'}" if defined $params{'project'};
+               delete $params{'project'};
+
+               # Summary just uses the project path URL
+               if (defined $params{'action'} && $params{'action'} eq 'summary') {
+                       delete $params{'action'};
+               }
+       }
+
+       # now encode the parameters explicitly
         my @result = ();
         for (my $i = 0; $i < @mapping; $i += 2) {
                 my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
         my @result = ();
         for (my $i = 0; $i < @mapping; $i += 2) {
                 my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
@@ -340,23 +418,43 @@ sub href(%) {
                         push @result, $symbol . "=" . esc_param($params{$name});
                 }
         }
                         push @result, $symbol . "=" . esc_param($params{$name});
                 }
         }
-       return "$my_uri?" . join(';', @result);
+       $href .= "?" . join(';', @result) if scalar @result;
+
+       return $href;
  }
  
  
  ## ======================================================================
  ## validation, quoting/unquoting and escaping
  
  }
  
  
  ## ======================================================================
  ## validation, quoting/unquoting and escaping
  
-sub validate_input {
-       my $input = shift;
+sub validate_pathname {
+       my $input = shift || return undef;
  
  
-       if ($input =~ m/^[0-9a-fA-F]{40}$/) {
-               return $input;
+       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # at the beginning, at the end, and between slashes.
+       # also this catches doubled slashes
+       if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
+               return undef;
         }
         }
-       if ($input =~ m/(^|\/)(|\.|\.\.)($|\/)/) {
+       # no null characters
+       if ($input =~ m!\0!) {
                 return undef;
         }
                 return undef;
         }
-       if ($input =~ m/[^a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%]/) {
+       return $input;
+}
+
+sub validate_refname {
+       my $input = shift || return undef;
+
+       # textual hashes are O.K.
+       if ($input =~ m/^[0-9a-fA-F]{40}$/) {
+               return $input;
+       }
+       # it must be correct pathname
+       $input = validate_pathname($input)
+               or return undef;
+       # restrictions on ref name according to git-check-ref-format
+       if ($input =~ m!(/\.|\.\.|[\000-\040\177 ~^:?*\[]|/$)!) {
                 return undef;
         }
         return $input;
                 return undef;
         }
         return $input;
@@ -365,6 +463,15 @@ sub validate_input {
  # quote unsafe chars, but keep the slash, even when it's not
  # correct, but quoted slashes look too horrible in bookmarks
  sub esc_param {
  # quote unsafe chars, but keep the slash, even when it's not
  # correct, but quoted slashes look too horrible in bookmarks
  sub esc_param {
+       my $str = shift;
+       $str =~ s/([^A-Za-z0-9\-_.~()\/:@])/sprintf("%%%02X", ord($1))/eg;
+       $str =~ s/\+/%2B/g;
+       $str =~ s/ /\+/g;
+       return $str;
+}
+
+# quote unsafe chars in whole URL, so some charactrs cannot be quoted
+sub esc_url {
         my $str = shift;
         $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
         $str =~ s/\+/%2B/g;
         my $str = shift;
         $str =~ s/([^A-Za-z0-9\-_.~();\/;?:@&=])/sprintf("%%%02X", ord($1))/eg;
         $str =~ s/\+/%2B/g;
@@ -378,6 +485,7 @@ sub esc_html {
         $str = decode("utf8", $str, Encode::FB_DEFAULT);
         $str = escapeHTML($str);
         $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
         $str = decode("utf8", $str, Encode::FB_DEFAULT);
         $str = escapeHTML($str);
         $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
+       $str =~ s/\033/^[/g; # "escape" ESCAPE (\e) character (e.g. commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1)
         return $str;
  }
  
         return $str;
  }
  
@@ -405,6 +513,12 @@ sub untabify {
         return $line;
  }
  
         return $line;
  }
  
+sub project_in_list {
+       my $project = shift;
+       my @list = git_get_projects_list();
+       return @list && scalar(grep { $_->{'path'} eq $project } @list);
+}
+
  ## ----------------------------------------------------------------------
  ## HTML aware string manipulation
  
  ## ----------------------------------------------------------------------
  ## HTML aware string manipulation
  
@@ -571,7 +685,7 @@ sub format_subject_html {
  
         if (length($short) < length($long)) {
                 return $cgi->a({-href => $href, -class => "list subject",
  
         if (length($short) < length($long)) {
                 return $cgi->a({-href => $href, -class => "list subject",
-                               -title => $long},
+                               -title => decode("utf8", $long, Encode::FB_DEFAULT)},
                        esc_html($short) . $extra);
         } else {
                 return $cgi->a({-href => $href, -class => "list subject"},
                        esc_html($short) . $extra);
         } else {
                 return $cgi->a({-href => $href, -class => "list subject"},
@@ -662,8 +776,9 @@ sub git_get_project_config {
  sub git_get_hash_by_path {
         my $base = shift;
         my $path = shift || return undef;
  sub git_get_hash_by_path {
         my $base = shift;
         my $path = shift || return undef;
+       my $type = shift;
  
  
-       my $tree = $base;
+       $path =~ s,/+$,,;
  
         open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
                 or die_error(undef, "Open git-ls-tree failed");
  
         open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path
                 or die_error(undef, "Open git-ls-tree failed");
@@ -672,6 +787,10 @@ sub git_get_hash_by_path {
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
         $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
  
         #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
         $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
+       if (defined $type && $type ne $2) {
+               # type doesn't match
+               return undef;
+       }
         return $3;
  }
  
         return $3;
  }
  
@@ -691,7 +810,7 @@ sub git_get_project_description {
  sub git_get_project_url_list {
         my $path = shift;
  
  sub git_get_project_url_list {
         my $path = shift;
  
-       open my $fd, "$projectroot/$path/cloneurl" or return undef;
+       open my $fd, "$projectroot/$path/cloneurl" or return;
         my @git_project_url_list = map { chomp; $_ } <$fd>;
         close $fd;
  
         my @git_project_url_list = map { chomp; $_ } <$fd>;
         close $fd;
  
@@ -717,7 +836,8 @@ sub git_get_projects_list {
  
                                 my $subdir = substr($File::Find::name, $pfxlen + 1);
                                 # we check related file in $projectroot
  
                                 my $subdir = substr($File::Find::name, $pfxlen + 1);
                                 # we check related file in $projectroot
-                               if (-e "$projectroot/$subdir/HEAD") {
+                               if (-e "$projectroot/$subdir/HEAD" && (!$export_ok ||
+                                   -e "$projectroot/$subdir/$export_ok")) {
                                         push @list, { path => $subdir };
                                         $File::Find::prune = 1;
                                 }
                                         push @list, { path => $subdir };
                                         $File::Find::prune = 1;
                                 }
@@ -729,7 +849,7 @@ sub git_get_projects_list {
                 # 'git%2Fgit.git Linus+Torvalds'
                 # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
                 # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
                 # 'git%2Fgit.git Linus+Torvalds'
                 # 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
                 # 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
-               open my ($fd), $projects_list or return undef;
+               open my ($fd), $projects_list or return;
                 while (my $line = <$fd>) {
                         chomp $line;
                         my ($path, $owner) = split ' ', $line;
                 while (my $line = <$fd>) {
                         chomp $line;
                         my ($path, $owner) = split ' ', $line;
@@ -738,7 +858,8 @@ sub git_get_projects_list {
                         if (!defined $path) {
                                 next;
                         }
                         if (!defined $path) {
                                 next;
                         }
-                       if (-e "$projectroot/$path/HEAD") {
+                       if (-e "$projectroot/$path/HEAD" && (!$export_ok ||
+                           -e "$projectroot/$path/$export_ok")) {
                                 my $pr = {
                                         path => $path,
                                         owner => decode("utf8", $owner, Encode::FB_DEFAULT),
                                 my $pr = {
                                         path => $path,
                                         owner => decode("utf8", $owner, Encode::FB_DEFAULT),
@@ -786,16 +907,10 @@ sub git_get_project_owner {
  sub git_get_references {
         my $type = shift || "";
         my %refs;
  sub git_get_references {
         my $type = shift || "";
         my %refs;
-       my $fd;
         # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c      refs/tags/v2.6.11
         # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
         # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c      refs/tags/v2.6.11
         # c39ae07f393806ccf406ef966e9a15afc43cc36a      refs/tags/v2.6.11^{}
-       if (-f "$projectroot/$project/info/refs") {
-               open $fd, "$projectroot/$project/info/refs"
-                       or return;
-       } else {
-               open $fd, "-|", git_cmd(), "ls-remote", "."
-                       or return;
-       }
+       open my $fd, "-|", $GIT, "peek-remote", "$projectroot/$project/"
+               or return;
  
         while (my $line = <$fd>) {
                 chomp $line;
  
         while (my $line = <$fd>) {
                 chomp $line;
@@ -1083,7 +1198,8 @@ sub parse_ls_tree_line ($;%) {
  ## parse to array of hashes functions
  
  sub git_get_refs_list {
  ## parse to array of hashes functions
  
  sub git_get_refs_list {
-       my $ref_dir = shift;
+       my $type = shift || "";
+       my %refs;
         my @reflist;
  
         my @refs;
         my @reflist;
  
         my @refs;
@@ -1091,14 +1207,21 @@ sub git_get_refs_list {
                 or return;
         while (my $line = <$fd>) {
                 chomp $line;
                 or return;
         while (my $line = <$fd>) {
                 chomp $line;
-               if ($line =~ m/^([0-9a-fA-F]{40})\t$ref_dir\/?([^\^]+)$/) {
-                       push @refs, { hash => $1, name => $2 };
-               } elsif ($line =~ m/^[0-9a-fA-F]{40}\t$ref_dir\/?(.*)\^\{\}$/ &&
-                        $1 eq $refs[-1]{'name'}) {
-                       # most likely a tag is followed by its peeled
-                       # (deref) one, and when that happens we know the
-                       # previous one was of type 'tag'.
-                       $refs[-1]{'type'} = "tag";
+               if ($line =~ m/^([0-9a-fA-F]{40})\trefs\/($type\/?([^\^]+))(\^\{\})?$/) {
+                       if (defined $refs{$1}) {
+                               push @{$refs{$1}}, $2;
+                       } else {
+                               $refs{$1} = [ $2 ];
+                       }
+
+                       if (! $4) { # unpeeled, direct reference
+                               push @refs, { hash => $1, name => $3 }; # without type
+                       } elsif ($3 eq $refs[-1]{'name'}) {
+                               # most likely a tag is followed by its peeled
+                               # (deref) one, and when that happens we know the
+                               # previous one was of type 'tag'.
+                               $refs[-1]{'type'} = "tag";
+                       }
                 }
         }
         close $fd;
                 }
         }
         close $fd;
@@ -1114,7 +1237,7 @@ sub git_get_refs_list {
         }
         # sort refs by age
         @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
         }
         # sort refs by age
         @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
-       return \@reflist;
+       return (\@reflist, \%refs);
  }
  
  ## ----------------------------------------------------------------------
  }
  
  ## ----------------------------------------------------------------------
@@ -1155,7 +1278,7 @@ sub mimetype_guess_file {
         }
         close(MIME);
  
         }
         close(MIME);
  
-       $filename =~ /\.(.*?)$/;
+       $filename =~ /\.([^.]*)$/;
         return $mimemap{$1};
  }
  
         return $mimemap{$1};
  }
  
@@ -1217,7 +1340,7 @@ sub git_header_html {
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
-                               $title .= " - $file_name";
+                               $title .= " - " . esc_html($file_name);
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
                                 if ($action eq "tree" && $file_name !~ m|/$|) {
                                         $title .= "/";
                                 }
@@ -1273,7 +1396,7 @@ EOF
               "<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
               "<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
               "</a>\n";
               "<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
               "<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
               "</a>\n";
-       print $cgi->a({-href => esc_param($home_link)}, $home_link_str) . " / ";
+       print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
         if (defined $project) {
                 print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                 if (defined $action) {
         if (defined $project) {
                 print $cgi->a({-href => href(action=>"summary")}, esc_html($project));
                 if (defined $action) {
@@ -1454,12 +1577,15 @@ sub git_print_page_path {
                 my $fullname = '';
  
                 print "<div class=\"page_path\">";
                 my $fullname = '';
  
                 print "<div class=\"page_path\">";
+               print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
+                             -title => 'tree root'}, "[$project]");
+               print " / ";
                 foreach my $dir (@dirname) {
                 foreach my $dir (@dirname) {
-                       $fullname .= $dir . '/';
+                       $fullname .= ($fullname ? '/' : '') . $dir;
                         print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                      hash_base=>$hb),
                                       -title => $fullname}, esc_html($dir));
                         print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                      hash_base=>$hb),
                                       -title => $fullname}, esc_html($dir));
-                       print "/";
+                       print " / ";
                 }
                 if (defined $type && $type eq 'blob') {
                         print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                 }
                 if (defined $type && $type eq 'blob') {
                         print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
@@ -1469,7 +1595,6 @@ sub git_print_page_path {
                         print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                      hash_base=>$hb),
                                       -title => $name}, esc_html($basename));
                         print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                      hash_base=>$hb),
                                       -title => $name}, esc_html($basename));
-                       print "/";
                 } else {
                         print esc_html($basename);
                 }
                 } else {
                         print esc_html($basename);
                 }
@@ -1543,48 +1668,45 @@ sub git_print_tree_entry {
         my %base_key = ();
         $base_key{hash_base} = $hash_base if defined $hash_base;
  
         my %base_key = ();
         $base_key{hash_base} = $hash_base if defined $hash_base;
  
+       # The format of a table row is: mode list link.  Where mode is
+       # the mode of the entry, list is the name of the entry, an href,
+       # and link is the action links of the entry.
+
         print "<td class=\"mode\">" . mode_str($t->{'mode'}) . "</td>\n";
         if ($t->{'type'} eq "blob") {
                 print "<td class=\"list\">" .
         print "<td class=\"mode\">" . mode_str($t->{'mode'}) . "</td>\n";
         if ($t->{'type'} eq "blob") {
                 print "<td class=\"list\">" .
-                     $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
-                                            file_name=>"$basedir$t->{'name'}", %base_key),
-                             -class => "list"}, esc_html($t->{'name'})) .
-                     "</td>\n" .
-                     "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
-                                            file_name=>"$basedir$t->{'name'}", %base_key)},
-                             "blob");
+                       $cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
+                                              file_name=>"$basedir$t->{'name'}", %base_key),
+                                -class => "list"}, esc_html($t->{'name'})) . "</td>\n";
+               print "<td class=\"link\">";
                 if ($have_blame) {
                 if ($have_blame) {
-                       print " | " .
-                               $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
-                                                      file_name=>"$basedir$t->{'name'}", %base_key)},
-                                       "blame");
+                       print $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
+                                                    file_name=>"$basedir$t->{'name'}", %base_key)},
+                                     "blame");
                 }
                 if (defined $hash_base) {
                 }
                 if (defined $hash_base) {
-                       print " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                       if ($have_blame) {
+                               print " | ";
+                       }
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
                                                      hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
                                       "history");
                 }
                 print " | " .
                                                      hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
                                       "history");
                 }
                 print " | " .
-                     $cgi->a({-href => href(action=>"blob_plain",
-                                            hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
-                             "raw") .
-                     "</td>\n";
+                       $cgi->a({-href => href(action=>"blob_plain", hash_base=>$hash_base,
+                                              file_name=>"$basedir$t->{'name'}")},
+                               "raw");
+               print "</td>\n";
  
         } elsif ($t->{'type'} eq "tree") {
  
         } elsif ($t->{'type'} eq "tree") {
-               print "<td class=\"list\">" .
-                     $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
-                                            file_name=>"$basedir$t->{'name'}", %base_key)},
-                             esc_html($t->{'name'})) .
-                     "</td>\n" .
-                     "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
+               print "<td class=\"list\">";
+               print $cgi->a({-href => href(action=>"tree", hash=>$t->{'hash'},
                                              file_name=>"$basedir$t->{'name'}", %base_key)},
                                              file_name=>"$basedir$t->{'name'}", %base_key)},
-                             "tree");
+                             esc_html($t->{'name'}));
+               print "</td>\n";
+               print "<td class=\"link\">";
                 if (defined $hash_base) {
                 if (defined $hash_base) {
-                       print " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
                                                      file_name=>"$basedir$t->{'name'}")},
                                       "history");
                 }
                                                      file_name=>"$basedir$t->{'name'}")},
                                       "history");
                 }
@@ -1605,7 +1727,7 @@ sub git_difftree_body {
         print "</div>\n";
  
         print "<table class=\"diff_tree\">\n";
         print "</div>\n";
  
         print "<table class=\"diff_tree\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         my $patchno = 0;
         foreach my $line (@{$difftree}) {
                 my %diff = parse_difftree_raw_line($line);
         my $patchno = 0;
         foreach my $line (@{$difftree}) {
                 my %diff = parse_difftree_raw_line($line);
@@ -1638,47 +1760,42 @@ sub git_difftree_body {
                         my $mode_chng = "<span class=\"file_status new\">[new $to_file_type";
                         $mode_chng   .= " with mode: $to_mode_str" if $to_mode_str;
                         $mode_chng   .= "]</span>";
                         my $mode_chng = "<span class=\"file_status new\">[new $to_file_type";
                         $mode_chng   .= " with mode: $to_mode_str" if $to_mode_str;
                         $mode_chng   .= "]</span>";
-                       print "<td>" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                       print "<td>";
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
                                                      hash_base=>$hash, file_name=>$diff{'file'}),
-                                     -class => "list"}, esc_html($diff{'file'})) .
-                             "</td>\n" .
-                             "<td>$mode_chng</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob");
+                                      -class => "list"}, esc_html($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chng</td>\n";
+                       print "<td class=\"link\">";
                         if ($action eq 'commitdiff') {
                                 # link to patch
                                 $patchno++;
                         if ($action eq 'commitdiff') {
                                 # link to patch
                                 $patchno++;
-                               print " | " .
-                                     $cgi->a({-href => "#patch$patchno"}, "patch");
+                               print $cgi->a({-href => "#patch$patchno"}, "patch");
                         }
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
                         my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
                         }
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "D") { # deleted
                         my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
-                       print "<td>" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
+                       print "<td>";
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                      hash_base=>$parent, file_name=>$diff{'file'}),
                                                      hash_base=>$parent, file_name=>$diff{'file'}),
-                                      -class => "list"}, esc_html($diff{'file'})) .
-                             "</td>\n" .
-                             "<td>$mode_chng</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
-                                                    hash_base=>$parent, file_name=>$diff{'file'})},
-                                     "blob") .
-                             " | ";
+                                      -class => "list"}, esc_html($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chng</td>\n";
+                       print "<td class=\"link\">";
                         if ($action eq 'commitdiff') {
                                 # link to patch
                                 $patchno++;
                         if ($action eq 'commitdiff') {
                                 # link to patch
                                 $patchno++;
-                               print " | " .
-                                     $cgi->a({-href => "#patch$patchno"}, "patch");
+                               print $cgi->a({-href => "#patch$patchno"}, "patch");
+                               print " | ";
                         }
                         }
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                    file_name=>$diff{'file'})},
+                                     "blame") . " | ";
                         print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
                         print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
-                                                    file_name=>$diff{'file'})},
-                                     "history") .
-                             "</td>\n";
+                                                    file_name=>$diff{'file'})},
+                                     "history");
+                       print "</td>\n";
  
                 } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
  
                 } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
@@ -1697,42 +1814,32 @@ sub git_difftree_body {
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
-                       if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
-                               print $cgi->a({-href => href(action=>"blobdiff",
-                                                            hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                            hash_base=>$hash, hash_parent_base=>$parent,
-                                                            file_name=>$diff{'file'}),
-                                             -class => "list"}, esc_html($diff{'file'}));
-                       } else { # only mode changed
-                               print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                            hash_base=>$hash, file_name=>$diff{'file'}),
-                                             -class => "list"}, esc_html($diff{'file'}));
-                       }
-                       print "</td>\n" .
-                             "<td>$mode_chnge</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob");
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff{'file'}),
+                                      -class => "list"}, esc_html($diff{'file'}));
+                       print "</td>\n";
+                       print "<td>$mode_chnge</td>\n";
+                       print "<td class=\"link\">";
                         if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
                                 if ($action eq 'commitdiff') {
                                         # link to patch
                                         $patchno++;
                         if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
                                 if ($action eq 'commitdiff') {
                                         # link to patch
                                         $patchno++;
-                                       print " | " .
-                                               $cgi->a({-href => "#patch$patchno"}, "patch");
+                                       print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 } else {
                                 } else {
-                                       print " | " .
-                                               $cgi->a({-href => href(action=>"blobdiff",
-                                                                      hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                                      hash_base=>$hash, hash_parent_base=>$parent,
-                                                                      file_name=>$diff{'file'})},
-                                                       "diff");
+                                       print $cgi->a({-href => href(action=>"blobdiff",
+                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                                    hash_base=>$hash, hash_parent_base=>$parent,
+                                                                    file_name=>$diff{'file'})},
+                                                     "diff");
                                 }
                                 }
+                               print " | ";
                         }
                         }
-                       print " | " .
-                               $cgi->a({-href => href(action=>"history",
-                                                      hash_base=>$hash, file_name=>$diff{'file'})},
-                                       "history");
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
+                                                    file_name=>$diff{'file'})},
+                                     "blame") . " | ";
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
+                                                    file_name=>$diff{'file'})},
+                                     "history");
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "R" || $diff{'status'} eq "C") { # renamed or copied
                         print "</td>\n";
  
                 } elsif ($diff{'status'} eq "R" || $diff{'status'} eq "C") { # renamed or copied
@@ -1752,25 +1859,27 @@ sub git_difftree_body {
                                                      hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
                                       -class => "list"}, esc_html($diff{'from_file'})) .
                               " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
                                                      hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
                                       -class => "list"}, esc_html($diff{'from_file'})) .
                               " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                    hash=>$diff{'to_id'}, file_name=>$diff{'to_file'})},
-                                     "blob");
+                             "<td class=\"link\">";
                         if ($diff{'to_id'} ne $diff{'from_id'}) {
                                 if ($action eq 'commitdiff') {
                                         # link to patch
                                         $patchno++;
                         if ($diff{'to_id'} ne $diff{'from_id'}) {
                                 if ($action eq 'commitdiff') {
                                         # link to patch
                                         $patchno++;
-                                       print " | " .
-                                               $cgi->a({-href => "#patch$patchno"}, "patch");
+                                       print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 } else {
                                 } else {
-                                       print " | " .
-                                               $cgi->a({-href => href(action=>"blobdiff",
-                                                                      hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                                      hash_base=>$hash, hash_parent_base=>$parent,
-                                                                      file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
-                                                       "diff");
+                                       print $cgi->a({-href => href(action=>"blobdiff",
+                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                                    hash_base=>$hash, hash_parent_base=>$parent,
+                                                                    file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
+                                                     "diff");
                                 }
                                 }
+                               print " | ";
                         }
                         }
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                    file_name=>$diff{'from_file'})},
+                                     "blame") . " | ";
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                                    file_name=>$diff{'from_file'})},
+                                     "history");
                         print "</td>\n";
  
                 } # we should not encounter Unmerged (U) or Unknown (X) status
                         print "</td>\n";
  
                 } # we should not encounter Unmerged (U) or Unknown (X) status
@@ -1908,14 +2017,11 @@ sub git_shortlog_body {
         # uses global variable $project
         my ($revlist, $from, $to, $refs, $extra) = @_;
  
         # uses global variable $project
         my ($revlist, $from, $to, $refs, $extra) = @_;
  
-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
-
         $from = 0 unless defined $from;
         $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
  
         print "<table class=\"shortlog\" cellspacing=\"0\">\n";
         $from = 0 unless defined $from;
         $to = $#{$revlist} if (!defined $to || $#{$revlist} < $to);
  
         print "<table class=\"shortlog\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
                 my $commit = $revlist->[$i];
                 #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
         for (my $i = $from; $i <= $to; $i++) {
                 my $commit = $revlist->[$i];
                 #my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
@@ -1935,11 +2041,9 @@ sub git_shortlog_body {
                                           href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
                                           href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
-               if ($have_snapshot) {
-                       print " | " .  $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
-               }
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree") . " | " .
+                     $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");
                 print "</td>\n" .
                       "</tr>\n";
         }
                 print "</td>\n" .
                       "</tr>\n";
         }
@@ -1959,7 +2063,7 @@ sub git_history_body {
         $to = $#{$revlist} unless (defined $to && $to <= $#{$revlist});
  
         print "<table class=\"history\" cellspacing=\"0\">\n";
         $to = $#{$revlist} unless (defined $to && $to <= $#{$revlist});
  
         print "<table class=\"history\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
                 if ($revlist->[$i] !~ m/^([0-9a-fA-F]{40})/) {
                         next;
         for (my $i = $from; $i <= $to; $i++) {
                 if ($revlist->[$i] !~ m/^([0-9a-fA-F]{40})/) {
                         next;
@@ -1988,9 +2092,8 @@ sub git_history_body {
                                           href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
                                           href(action=>"commit", hash=>$commit), $ref);
                 print "</td>\n" .
                       "<td class=\"link\">" .
-                     $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
-                     $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype);
+                     $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype) . " | " .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
  
                 if ($ftype eq 'blob') {
                         my $blob_current = git_get_hash_by_path($hash_base, $file_name);
  
                 if ($ftype eq 'blob') {
                         my $blob_current = git_get_hash_by_path($hash_base, $file_name);
@@ -2023,7 +2126,7 @@ sub git_tags_body {
         $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
  
         print "<table class=\"tags\" cellspacing=\"0\">\n";
         $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
  
         print "<table class=\"tags\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
                 my $entry = $taglist->[$i];
                 my %tag = %$entry;
         for (my $i = $from; $i <= $to; $i++) {
                 my $entry = $taglist->[$i];
                 my %tag = %$entry;
@@ -2078,14 +2181,14 @@ sub git_tags_body {
  
  sub git_heads_body {
         # uses global variable $project
  
  sub git_heads_body {
         # uses global variable $project
-       my ($taglist, $head, $from, $to, $extra) = @_;
+       my ($headlist, $head, $from, $to, $extra) = @_;
         $from = 0 unless defined $from;
         $from = 0 unless defined $from;
-       $to = $#{$taglist} if (!defined $to || $#{$taglist} < $to);
+       $to = $#{$headlist} if (!defined $to || $#{$headlist} < $to);
  
         print "<table class=\"heads\" cellspacing=\"0\">\n";
  
         print "<table class=\"heads\" cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         for (my $i = $from; $i <= $to; $i++) {
         for (my $i = $from; $i <= $to; $i++) {
-               my $entry = $taglist->[$i];
+               my $entry = $headlist->[$i];
                 my %tag = %$entry;
                 my $curr = $tag{'id'} eq $head;
                 if ($alternate) {
                 my %tag = %$entry;
                 my $curr = $tag{'id'} eq $head;
                 if ($alternate) {
@@ -2101,7 +2204,8 @@ sub git_heads_body {
                       "</td>\n" .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") . " | " .
                       "</td>\n" .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(action=>"shortlog", hash=>$tag{'name'})}, "shortlog") . " | " .
-                     $cgi->a({-href => href(action=>"log", hash=>$tag{'name'})}, "log") .
+                     $cgi->a({-href => href(action=>"log", hash=>$tag{'name'})}, "log") . " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$tag{'name'}, hash_base=>$tag{'name'})}, "tree") .
                       "</td>\n" .
                       "</tr>";
         }
                       "</td>\n" .
                       "</tr>";
         }
@@ -2198,7 +2302,7 @@ sub git_project_list {
         }
         print "<th></th>\n" .
               "</tr>\n";
         }
         print "<th></th>\n" .
               "</tr>\n";
-       my $alternate = 0;
+       my $alternate = 1;
         foreach my $pr (@projects) {
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
         foreach my $pr (@projects) {
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
@@ -2215,7 +2319,8 @@ sub git_project_list {
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary")}, "summary")   . " | " .
                       $cgi->a({-href => href(project=>$pr->{'path'}, action=>"shortlog")}, "shortlog") . " | " .
                       "<td class=\"link\">" .
                       $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary")}, "summary")   . " | " .
                       $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=>"log")}, "log") . " | " .
+                     $cgi->a({-href => href(project=>$pr->{'path'}, action=>"tree")}, "tree") .
                       "</td>\n" .
                       "</tr>\n";
         }
                       "</td>\n" .
                       "</tr>\n";
         }
@@ -2229,7 +2334,7 @@ sub git_project_index {
         print $cgi->header(
                 -type => 'text/plain',
                 -charset => 'utf-8',
         print $cgi->header(
                 -type => 'text/plain',
                 -charset => 'utf-8',
-               -content_disposition => qq(inline; filename="index.aux"));
+               -content_disposition => 'inline; filename="index.aux"');
  
         foreach my $pr (@projects) {
                 if (!exists $pr->{'owner'}) {
  
         foreach my $pr (@projects) {
                 if (!exists $pr->{'owner'}) {
@@ -2255,7 +2360,19 @@ sub git_summary {
  
         my $owner = git_get_project_owner($project);
  
  
         my $owner = git_get_project_owner($project);
  
-       my $refs = git_get_references();
+       my ($reflist, $refs) = git_get_refs_list();
+
+       my @taglist;
+       my @headlist;
+       foreach my $ref (@$reflist) {
+               if ($ref->{'name'} =~ s!^heads/!!) {
+                       push @headlist, $ref;
+               } else {
+                       $ref->{'name'} =~ s!^tags/!!;
+                       push @taglist, $ref;
+               }
+       }
+
         git_header_html();
         git_print_page_nav('summary','', $head);
  
         git_header_html();
         git_print_page_nav('summary','', $head);
  
@@ -2285,17 +2402,15 @@ sub git_summary {
         git_shortlog_body(\@revlist, 0, 15, $refs,
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
         git_shortlog_body(\@revlist, 0, 15, $refs,
                           $cgi->a({-href => href(action=>"shortlog")}, "..."));
  
-       my $taglist = git_get_refs_list("refs/tags");
-       if (defined @$taglist) {
+       if (@taglist) {
                 git_print_header_div('tags');
                 git_print_header_div('tags');
-               git_tags_body($taglist, 0, 15,
+               git_tags_body(\@taglist, 0, 15,
                               $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
                               $cgi->a({-href => href(action=>"tags")}, "..."));
         }
  
-       my $headlist = git_get_refs_list("refs/heads");
-       if (defined @$headlist) {
+       if (@headlist) {
                 git_print_header_div('heads');
                 git_print_header_div('heads');
-               git_heads_body($headlist, $head, 0, 15,
+               git_heads_body(\@headlist, $head, 0, 15,
                                $cgi->a({-href => href(action=>"heads")}, "..."));
         }
  
                                $cgi->a({-href => href(action=>"heads")}, "..."));
         }
  
@@ -2335,9 +2450,64 @@ sub git_tag {
         git_footer_html();
  }
  
         git_footer_html();
  }
  
+sub git_blame_flush_chunk {
+       my ($name, $revdata, $color, $rev, @line) = @_;
+       my $label = substr($rev, 0, 8);
+       my $line = scalar(@line);
+       my $cnt = 0;
+       my $pop = '';
+
+       if ($revdata->{$rev} ne '') {
+               $pop = ' title="' . esc_html($revdata->{$rev}) . '"';
+       }
+
+       for (@line) {
+               my ($lineno, $data) = @$_;
+               $cnt++;
+               print "<tr class=\"$color\">\n";
+               if ($cnt == 1) {
+                       print "<td class=\"sha1\"$pop";
+                       if ($line > 1) {
+                               print " rowspan=\"$line\"";
+                       }
+                       print ">";
+                       print $cgi->a({-href => href(action=>"commit",
+                                                    hash=>$rev,
+                                                    file_name=>$name)},
+                                     $label);
+                       print "</td>\n";
+               }
+               print "<td class=\"linenr\">".
+                   "<a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
+                   esc_html($lineno) . "</a></td>\n";
+               print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
+               print "</tr>\n";
+       }
+}
+
+# We can have up to N*2 lines.  If it is more than N lines, split it
+# into two to avoid orphans.
+sub git_blame_flush_chunk_1 {
+       my ($chunk_cap, $name, $revdata, $color, $rev, @chunk) = @_;
+       if ($chunk_cap < @chunk) {
+               my @first = splice(@chunk, 0, @chunk/2);
+               git_blame_flush_chunk($name,
+                                     $revdata,
+                                     $color,
+                                     $rev,
+                                     @first);
+       }
+       git_blame_flush_chunk($name,
+                             $revdata,
+                             $color,
+                             $rev,
+                             @chunk);
+}
+
  sub git_blame2 {
         my $fd;
         my $ftype;
  sub git_blame2 {
         my $fd;
         my $ftype;
+       my $chunk_cap = 20;
  
         my ($have_blame) = gitweb_check_feature('blame');
         if (!$have_blame) {
  
         my ($have_blame) = gitweb_check_feature('blame');
         if (!$have_blame) {
@@ -2356,15 +2526,18 @@ sub git_blame2 {
         if ($ftype !~ "blob") {
                 die_error("400 Bad Request", "Object is not a blob");
         }
         if ($ftype !~ "blob") {
                 die_error("400 Bad Request", "Object is not a blob");
         }
-       open ($fd, "-|", git_cmd(), "blame", '-l', $file_name, $hash_base)
+       open ($fd, "-|", git_cmd(), "blame", '-l', '--', $file_name, $hash_base)
                 or die_error(undef, "Open git-blame failed");
         git_header_html();
         my $formats_nav =
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
                 or die_error(undef, "Open git-blame failed");
         git_header_html();
         my $formats_nav =
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
+               $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
+                       "history") .
+               " | " .
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
-                       "head");
+                       "HEAD");
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, $ftype, $hash_base);
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, $ftype, $hash_base);
@@ -2377,27 +2550,45 @@ sub git_blame2 {
  <table class="blame">
  <tr><th>Commit</th><th>Line</th><th>Data</th></tr>
  HTML
  <table class="blame">
  <tr><th>Commit</th><th>Line</th><th>Data</th></tr>
  HTML
+       my @chunk = ();
+       my %revdata = ();
         while (<$fd>) {
                 /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
         while (<$fd>) {
                 /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
-               my $full_rev = $1;
-               my $rev = substr($full_rev, 0, 8);
-               my $lineno = $2;
-               my $data = $3;
-
+               my ($full_rev, $author, $date, $lineno, $data) =
+                   /^([0-9a-f]{40}).*?\s\((.*?)\s+([-\d]+ [:\d]+ [-+\d]+)\s+(\d+)\)\s(.*)/;
+               if (!exists $revdata{$full_rev}) {
+                       $revdata{$full_rev} = "$author, $date";
+               }
                 if (!defined $last_rev) {
                         $last_rev = $full_rev;
                 } elsif ($last_rev ne $full_rev) {
                 if (!defined $last_rev) {
                         $last_rev = $full_rev;
                 } elsif ($last_rev ne $full_rev) {
+                       git_blame_flush_chunk_1($chunk_cap,
+                                               $file_name,
+                                               \%revdata,
+                                               $rev_color[$current_color],
+                                               $last_rev, @chunk);
+                       @chunk = ();
                         $last_rev = $full_rev;
                         $current_color = ++$current_color % $num_colors;
                 }
                         $last_rev = $full_rev;
                         $current_color = ++$current_color % $num_colors;
                 }
-               print "<tr class=\"$rev_color[$current_color]\">\n";
-               print "<td class=\"sha1\">" .
-                       $cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
-                               esc_html($rev)) . "</td>\n";
-               print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
-                     esc_html($lineno) . "</a></td>\n";
-               print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
-               print "</tr>\n";
+               elsif ($chunk_cap * 2 < @chunk) {
+                       # We have more than N*2 lines from the same
+                       # revision.  Flush N lines and leave N lines
+                       # in @chunk to avoid orphaned lines.
+                       my @first = splice(@chunk, 0, $chunk_cap);
+                       git_blame_flush_chunk($file_name,
+                                             \%revdata,
+                                             $rev_color[$current_color],
+                                             $last_rev, @first);
+               }
+               push @chunk, [$lineno, $data];
+       }
+       if (@chunk) {
+               git_blame_flush_chunk_1($chunk_cap,
+                                       $file_name,
+                                       \%revdata,
+                                       $rev_color[$current_color],
+                                       $last_rev, @chunk);
         }
         print "</table>\n";
         print "</div>";
         }
         print "</table>\n";
         print "</div>";
@@ -2429,8 +2620,11 @@ sub git_blame {
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
                 $cgi->a({-href => href(action=>"blob", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
                         "blob") .
                 " | " .
+               $cgi->a({-href => href(action=>"history", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name)},
+                       "history") .
+               " | " .
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
                 $cgi->a({-href => href(action=>"blame", file_name=>$file_name)},
-                       "head");
+                       "HEAD");
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, 'blob', $hash_base);
         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
         git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
         git_print_page_path($file_name, 'blob', $hash_base);
@@ -2506,8 +2700,8 @@ sub git_tags {
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
-       my $taglist = git_get_refs_list("refs/tags");
-       if (defined @$taglist) {
+       my ($taglist) = git_get_refs_list("tags");
+       if (@$taglist) {
                 git_tags_body($taglist);
         }
         git_footer_html();
                 git_tags_body($taglist);
         }
         git_footer_html();
@@ -2519,19 +2713,15 @@ sub git_heads {
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
         git_print_page_nav('','', $head,undef,$head);
         git_print_header_div('summary', $project);
  
-       my $taglist = git_get_refs_list("refs/heads");
-       if (defined @$taglist) {
-               git_heads_body($taglist, $head);
+       my ($headlist) = git_get_refs_list("heads");
+       if (@$headlist) {
+               git_heads_body($headlist, $head);
         }
         git_footer_html();
  }
  
  sub git_blob_plain {
         }
         git_footer_html();
  }
  
  sub git_blob_plain {
-       # blobs defined by non-textual hash id's can be cached
         my $expires;
         my $expires;
-       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
-               $expires = "+1d";
-       }
  
         if (!defined $hash) {
                 if (defined $file_name) {
  
         if (!defined $hash) {
                 if (defined $file_name) {
@@ -2541,7 +2731,11 @@ sub git_blob_plain {
                 } else {
                         die_error(undef, "No file name defined");
                 }
                 } else {
                         die_error(undef, "No file name defined");
                 }
+       } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               # blobs defined by non-textual hash id's can be cached
+               $expires = "+1d";
         }
         }
+
         my $type = shift;
         open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
         my $type = shift;
         open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
                 or die_error(undef, "Couldn't cat $file_name, $hash");
@@ -2559,7 +2753,7 @@ sub git_blob_plain {
         print $cgi->header(
                 -type => "$type",
                 -expires=>$expires,
         print $cgi->header(
                 -type => "$type",
                 -expires=>$expires,
-               -content_disposition => "inline; filename=\"$save_as\"");
+               -content_disposition => 'inline; filename="' . "$save_as" . '"');
         undef $/;
         binmode STDOUT, ':raw';
         print <$fd>;
         undef $/;
         binmode STDOUT, ':raw';
         print <$fd>;
@@ -2569,11 +2763,7 @@ sub git_blob_plain {
  }
  
  sub git_blob {
  }
  
  sub git_blob {
-       # blobs defined by non-textual hash id's can be cached
         my $expires;
         my $expires;
-       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
-               $expires = "+1d";
-       }
  
         if (!defined $hash) {
                 if (defined $file_name) {
  
         if (!defined $hash) {
                 if (defined $file_name) {
@@ -2583,7 +2773,11 @@ sub git_blob {
                 } else {
                         die_error(undef, "No file name defined");
                 }
                 } else {
                         die_error(undef, "No file name defined");
                 }
+       } elsif ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               # blobs defined by non-textual hash id's can be cached
+               $expires = "+1d";
         }
         }
+
         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 ($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");
@@ -2604,16 +2798,20 @@ sub git_blob {
                                         " | ";
                         }
                         $formats_nav .=
                                         " | ";
                         }
                         $formats_nav .=
+                               $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                      hash=>$hash, file_name=>$file_name)},
+                                       "history") .
+                               " | " .
                                 $cgi->a({-href => href(action=>"blob_plain",
                                                        hash=>$hash, file_name=>$file_name)},
                                 $cgi->a({-href => href(action=>"blob_plain",
                                                        hash=>$hash, file_name=>$file_name)},
-                                       "plain") .
+                                       "raw") .
                                 " | " .
                                 $cgi->a({-href => href(action=>"blob",
                                                        hash_base=>"HEAD", file_name=>$file_name)},
                                 " | " .
                                 $cgi->a({-href => href(action=>"blob",
                                                        hash_base=>"HEAD", file_name=>$file_name)},
-                                       "head");
+                                       "HEAD");
                 } else {
                         $formats_nav .=
                 } else {
                         $formats_nav .=
-                               $cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "plain");
+                               $cgi->a({-href => href(action=>"blob_plain", hash=>$hash)}, "raw");
                 }
                 git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                 git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
                 }
                 git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                 git_print_header_div('commit', esc_html($co{'title'}), $hash_base);
@@ -2639,14 +2837,16 @@ sub git_blob {
  }
  
  sub git_tree {
  }
  
  sub git_tree {
+       my $have_snapshot = gitweb_have_snapshot();
+
+       if (!defined $hash_base) {
+               $hash_base = "HEAD";
+       }
         if (!defined $hash) {
         if (!defined $hash) {
-               $hash = git_get_head_hash($project);
                 if (defined $file_name) {
                 if (defined $file_name) {
-                       my $base = $hash_base || $hash;
-                       $hash = git_get_hash_by_path($base, $file_name, "tree");
-               }
-               if (!defined $hash_base) {
-                       $hash_base = $hash;
+                       $hash = git_get_hash_by_path($hash_base, $file_name, "tree");
+               } else {
+                       $hash = $hash_base;
                 }
         }
         $/ = "\0";
                 }
         }
         $/ = "\0";
@@ -2662,7 +2862,23 @@ sub git_tree {
         my $base = "";
         my ($have_blame) = gitweb_check_feature('blame');
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
         my $base = "";
         my ($have_blame) = gitweb_check_feature('blame');
         if (defined $hash_base && (my %co = parse_commit($hash_base))) {
-               git_print_page_nav('tree','', $hash_base);
+               my @views_nav = ();
+               if (defined $file_name) {
+                       push @views_nav,
+                               $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                      hash=>$hash, file_name=>$file_name)},
+                                       "history"),
+                               $cgi->a({-href => href(action=>"tree",
+                                                      hash_base=>"HEAD", file_name=>$file_name)},
+                                       "HEAD"),
+               }
+               if ($have_snapshot) {
+                       # FIXME: Should be available when we have no hash base as well.
+                       push @views_nav,
+                               $cgi->a({-href => href(action=>"snapshot", hash=>$hash)},
+                                       "snapshot");
+               }
+               git_print_page_nav('tree','', $hash_base, undef, undef, join(' | ', @views_nav));
                 git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
         } else {
                 undef $hash_base;
                 git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
         } else {
                 undef $hash_base;
@@ -2676,7 +2892,7 @@ sub git_tree {
         git_print_page_path($file_name, 'tree', $hash_base);
         print "<div class=\"page_body\">\n";
         print "<table cellspacing=\"0\">\n";
         git_print_page_path($file_name, 'tree', $hash_base);
         print "<div class=\"page_body\">\n";
         print "<table cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         foreach my $line (@entries) {
                 my %t = parse_ls_tree_line($line, -z => 1);
  
         foreach my $line (@entries) {
                 my %t = parse_ls_tree_line($line, -z => 1);
  
@@ -2697,7 +2913,6 @@ sub git_tree {
  }
  
  sub git_snapshot {
  }
  
  sub git_snapshot {
-
         my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
         my $have_snapshot = (defined $ctype && defined $suffix);
         if (!$have_snapshot) {
         my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
         my $have_snapshot = (defined $ctype && defined $suffix);
         if (!$have_snapshot) {
@@ -2710,10 +2925,11 @@ sub git_snapshot {
  
         my $filename = basename($project) . "-$hash.tar.$suffix";
  
  
         my $filename = basename($project) . "-$hash.tar.$suffix";
  
-       print $cgi->header(-type => 'application/x-tar',
-                          -content_encoding => $ctype,
-                          -content_disposition => "inline; filename=\"$filename\"",
-                          -status => '200 OK');
+       print $cgi->header(
+               -type => 'application/x-tar',
+               -content_encoding => $ctype,
+               -content_disposition => 'inline; filename="' . "$filename" . '"',
+               -status => '200 OK');
  
         my $git_command = git_cmd_str();
         open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
  
         my $git_command = git_cmd_str();
         open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
@@ -2767,6 +2983,8 @@ sub git_log {
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") .
                       " | " .
                       $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") .
                       $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") .
                       " | " .
                       $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") .
+                     " | " .
+                     $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree") .
                       "<br/>\n" .
                       "</div>\n" .
                       "<i>" . esc_html($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .
                       "<br/>\n" .
                       "</div>\n" .
                       "<i>" . esc_html($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .
@@ -2804,20 +3022,23 @@ sub git_commit {
         my $refs = git_get_references();
         my $ref = format_ref_marker($refs, $co{'id'});
  
         my $refs = git_get_references();
         my $ref = format_ref_marker($refs, $co{'id'});
  
-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
+       my $have_snapshot = gitweb_have_snapshot();
  
  
-       my $formats_nav = '';
+       my @views_nav = ();
         if (defined $file_name && defined $co{'parent'}) {
         if (defined $file_name && defined $co{'parent'}) {
-               my $parent = $co{'parent'};
-               $formats_nav .=
+               push @views_nav,
                         $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
                                 "blame");
         }
                         $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
                                 "blame");
         }
+       if (defined $co{'parent'}) {
+               push @views_nav,
+                       $cgi->a({-href => href(action=>"shortlog", hash=>$hash)}, "shortlog"),
+                       $cgi->a({-href => href(action=>"log", hash=>$hash)}, "log");
+       }
         git_header_html(undef, $expires);
         git_print_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
                            $hash, $co{'tree'}, $hash,
         git_header_html(undef, $expires);
         git_print_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
                            $hash, $co{'tree'}, $hash,
-                          $formats_nav);
+                          join (' | ', @views_nav));
  
         if (defined $co{'parent'}) {
                 git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
  
         if (defined $co{'parent'}) {
                 git_print_header_div('commitdiff', esc_html($co{'title'}) . $ref, $hash);
@@ -2996,7 +3217,7 @@ sub git_blobdiff {
                                                hash=>$hash, hash_parent=>$hash_parent,
                                                hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
                                                file_name=>$file_name, file_parent=>$file_parent)},
                                                hash=>$hash, hash_parent=>$hash_parent,
                                                hash_base=>$hash_base, hash_parent_base=>$hash_parent_base,
                                                file_name=>$file_name, file_parent=>$file_parent)},
-                               "plain");
+                               "raw");
                 git_header_html(undef, $expires);
                 if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
                 git_header_html(undef, $expires);
                 if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
@@ -3016,7 +3237,7 @@ sub git_blobdiff {
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
-                       -content_disposition => qq(inline; filename="${file_name}.patch"));
+                       -content_disposition => 'inline; filename="' . "$file_name" . '.patch"');
  
                 print "X-Git-Url: " . $cgi->self_url() . "\n\n";
  
  
                 print "X-Git-Url: " . $cgi->self_url() . "\n\n";
  
@@ -3036,8 +3257,8 @@ sub git_blobdiff {
  
         } else {
                 while (my $line = <$fd>) {
  
         } else {
                 while (my $line = <$fd>) {
-                       $line =~ s!a/($hash|$hash_parent)!a/$diffinfo{'from_file'}!g;
-                       $line =~ s!b/($hash|$hash_parent)!b/$diffinfo{'to_file'}!g;
+                       $line =~ s!a/($hash|$hash_parent)!'a/'.esc_html($diffinfo{'from_file'})!eg;
+                       $line =~ s!b/($hash|$hash_parent)!'b/'.esc_html($diffinfo{'to_file'})!eg;
  
                         print $line;
  
  
                         print $line;
  
@@ -3099,7 +3320,7 @@ sub git_commitdiff {
                 my $formats_nav =
                         $cgi->a({-href => href(action=>"commitdiff_plain",
                                                hash=>$hash, hash_parent=>$hash_parent)},
                 my $formats_nav =
                         $cgi->a({-href => href(action=>"commitdiff_plain",
                                                hash=>$hash, hash_parent=>$hash_parent)},
-                               "plain");
+                               "raw");
  
                 git_header_html(undef, $expires);
                 git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
  
                 git_header_html(undef, $expires);
                 git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
@@ -3119,7 +3340,7 @@ sub git_commitdiff {
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
                         -type => 'text/plain',
                         -charset => 'utf-8',
                         -expires => $expires,
-                       -content_disposition => qq(inline; filename="$filename"));
+                       -content_disposition => 'inline; filename="' . "$filename" . '"');
                 my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                 print <<TEXT;
  From: $co{'author'}
                 my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                 print <<TEXT;
  From: $co{'author'}
@@ -3264,7 +3485,7 @@ sub git_search {
         git_print_header_div('commit', esc_html($co{'title'}), $hash);
  
         print "<table cellspacing=\"0\">\n";
         git_print_header_div('commit', esc_html($co{'title'}), $hash);
  
         print "<table cellspacing=\"0\">\n";
-       my $alternate = 0;
+       my $alternate = 1;
         if ($commit_search) {
                 $/ = "\0";
                 open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", $hash or next;
         if ($commit_search) {
                 $/ = "\0";
                 open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", $hash or next;
@@ -3466,7 +3687,7 @@ XML
                         if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) {
                                 next;
                         }
                         if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) {
                                 next;
                         }
-                       my $file = validate_input(unquote($7));
+                       my $file = esc_html(unquote($7));
                         $file = decode("utf8", $file, Encode::FB_DEFAULT);
                         print "$file<br/>\n";
                 }
                         $file = decode("utf8", $file, Encode::FB_DEFAULT);
                         print "$file<br/>\n";
                 }