gitweb: Divide page path into directories -- path's "breadcrumbs"

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 620d15b56ac6aabe226958455c18f2f128724e73a2dd86a72cd9481176b3eb7a..daab9427cf9b0b6437e09f5387217a6ff2b78b2c64e3a9a120ffbecc092480d1 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -31,9 +31,6 @@ our $GIT = "++GIT_BINDIR++/git";
 #our $projectroot = "/pub/scm";
 our $projectroot = "++GITWEB_PROJECTROOT++";
 
 #our $projectroot = "/pub/scm";
 our $projectroot = "++GITWEB_PROJECTROOT++";
 

-# location for temporary files needed for diffs
-our $git_temp = "/tmp/gitweb";
-

 # target of the home link on top of all pages
 our $home_link = $my_uri || "/";
 
 # target of the home link on top of all pages
 our $home_link = $my_uri || "/";
 


@@ -51,6 +48,8 @@ our $home_text = "++GITWEB_HOMETEXT++";
 our $stylesheet = "++GITWEB_CSS++";
 # URI of GIT logo
 our $logo = "++GITWEB_LOGO++";
 our $stylesheet = "++GITWEB_CSS++";
 # URI of GIT logo
 our $logo = "++GITWEB_LOGO++";

+# URI of GIT favicon, assumed to be image/png type
+our $favicon = "++GITWEB_FAVICON++";

 
 # source of projects list
 our $projects_list = "++GITWEB_LIST++";
 
 # source of projects list
 our $projects_list = "++GITWEB_LIST++";


@@ -70,9 +69,16 @@ our $mimetypes_file = undef;
 # You define site-wide feature defaults here; override them with
 # $GITWEB_CONFIG as necessary.
 our %feature = (
 # You define site-wide feature defaults here; override them with
 # $GITWEB_CONFIG as necessary.
 our %feature = (

-       # feature => {'sub' => feature-sub, 'override' => allow-override, 'default' => [ default options...]
-       # if feature is overridable, feature-sub will be called with default options;
-       # return value indicates if to enable specified feature
+       # feature => {
+       #       'sub' => feature-sub (subroutine),
+       #       'override' => allow-override (boolean),
+       #       'default' => [ default options...] (array reference)}
+       #
+       # if feature is overridable (it means that allow-override has true value,
+       # then feature-sub will be called with default options as parameters;
+       # return value of feature-sub indicates if to enable specified feature
+       #
+       # use gitweb_check_feature(<feature>) to check if <feature> is enabled

 
        'blame' => {
                'sub' => \&feature_blame,
 
        'blame' => {
                'sub' => \&feature_blame,


@@ -98,9 +104,9 @@ sub gitweb_check_feature {
 }
 
 # To enable system wide have in $GITWEB_CONFIG
 }
 
 # To enable system wide have in $GITWEB_CONFIG

-# $feature{'blame'}{'default'} =  [1];
-# To have project specific config enable override in  $GITWEB_CONFIG
-# $feature{'blame'}{'override'} =  1;
+# $feature{'blame'}{'default'} = [1];
+# To have project specific config enable override in $GITWEB_CONFIG
+# $feature{'blame'}{'override'} = 1;

 # and in project config gitweb.blame = 0|1;
 
 sub feature_blame {
 # and in project config gitweb.blame = 0|1;
 
 sub feature_blame {


@@ -116,9 +122,9 @@ sub feature_blame {
 }
 
 # To disable system wide have in $GITWEB_CONFIG
 }
 
 # To disable system wide have in $GITWEB_CONFIG

-# $feature{'snapshot'}{'default'} =  [undef];
-# To have project specific config enable override in  $GITWEB_CONFIG
-# $feature{'blame'}{'override'} =  1;
+# $feature{'snapshot'}{'default'} = [undef];
+# To have project specific config enable override in $GITWEB_CONFIG
+# $feature{'blame'}{'override'} = 1;

 # and in project config  gitweb.snapshot = none|gzip|bzip2
 
 sub feature_snapshot {
 # and in project config  gitweb.snapshot = none|gzip|bzip2
 
 sub feature_snapshot {


@@ -137,16 +143,26 @@ sub feature_snapshot {
        return ($ctype, $suffix, $command);
 }
 
        return ($ctype, $suffix, $command);
 }
 

+# rename detection options for git-diff and git-diff-tree
+# - default is '-M', with the cost proportional to
+#   (number of removed files) * (number of new files).
+# - more costly is '-C' (or '-C', '-M'), with the cost proportional to
+#   (number of changed files + number of removed files) * (number of new files)
+# - even more costly is '-C', '--find-copies-harder' with cost
+#   (number of files in the original tree) * (number of new files)
+# - one might want to include '-B' option, e.g. '-B', '-M'
+our @diff_opts = ('-M'); # taken from git_commit
+

 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";

-require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
+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;

-if (! -d $git_temp) {
-       mkdir($git_temp, 0700) || die_error(undef, "Couldn't mkdir $git_temp");
-}

 
 # ======================================================================
 # input validation and dispatch
 
 # ======================================================================
 # input validation and dispatch


@@ -173,7 +189,7 @@ if (defined $project) {
        if (!(-e "$projectroot/$project/HEAD")) {
                die_error(undef, "No such project");
        }
        if (!(-e "$projectroot/$project/HEAD")) {
                die_error(undef, "No such project");
        }

-       $ENV{'GIT_DIR'} = "$projectroot/$project";
+       $git_dir = "$projectroot/$project";

 }
 
 our $file_name = $cgi->param('f');
 }
 
 our $file_name = $cgi->param('f');


@@ -561,21 +577,31 @@ sub format_diff_line {
 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 
 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 

+# returns path to the core git executable and the --git-dir parameter as list
+sub git_cmd {
+       return $GIT, '--git-dir='.$git_dir;
+}
+
+# returns path to the core git executable and the --git-dir parameter as string
+sub git_cmd_str {
+       return join(' ', git_cmd());
+}
+

 # get HEAD ref of given project as hash
 sub git_get_head_hash {
        my $project = shift;
 # get HEAD ref of given project as hash
 sub git_get_head_hash {
        my $project = shift;

-       my $oENV = $ENV{'GIT_DIR'};
+       my $o_git_dir = $git_dir;

        my $retval = undef;
        my $retval = undef;

-       $ENV{'GIT_DIR'} = "$projectroot/$project";
-       if (open my $fd, "-|", $GIT, "rev-parse", "--verify", "HEAD") {
+       $git_dir = "$projectroot/$project";
+       if (open my $fd, "-|", git_cmd(), "rev-parse", "--verify", "HEAD") {

                my $head = <$fd>;
                close $fd;
                if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
                        $retval = $1;
                }
        }
                my $head = <$fd>;
                close $fd;
                if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) {
                        $retval = $1;
                }
        }

-       if (defined $oENV) {
-               $ENV{'GIT_DIR'} = $oENV;
+       if (defined $o_git_dir) {
+               $git_dir = $o_git_dir;

        }
        return $retval;
 }
        }
        return $retval;
 }


@@ -584,7 +610,7 @@ sub git_get_head_hash {
 sub git_get_type {
        my $hash = shift;
 
 sub git_get_type {
        my $hash = shift;
 

-       open my $fd, "-|", $GIT, "cat-file", '-t', $hash or return;
+       open my $fd, "-|", git_cmd(), "cat-file", '-t', $hash or return;

        my $type = <$fd>;
        close $fd or return;
        chomp $type;
        my $type = <$fd>;
        close $fd or return;
        chomp $type;


@@ -598,7 +624,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, 'repo-config');
+       my @x = (git_cmd(), 'repo-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";


@@ -614,7 +640,7 @@ sub git_get_hash_by_path {
 
        my $tree = $base;
 
 
        my $tree = $base;
 

-       open my $fd, "-|", $GIT, "ls-tree", $base, "--", $path
+       open my $fd, "-|", git_cmd(), "ls-tree", $base, "--", $path

                or die_error(undef, "Open git-ls-tree failed");
        my $line = <$fd>;
        close $fd or return undef;
                or die_error(undef, "Open git-ls-tree failed");
        my $line = <$fd>;
        close $fd or return undef;


@@ -624,26 +650,6 @@ sub git_get_hash_by_path {
        return $3;
 }
 
        return $3;
 }
 

-# converts symbolic name to hash
-sub git_to_hash {
-       my @params = @_;
-       return undef unless @params;
-
-       open my $fd, "-|", $GIT, "rev-parse", @params
-               or return undef;
-       my @hashes = map { chomp; $_ } <$fd>;
-       close $fd;
-
-       if (wantarray) {
-               return @hashes;
-       } elsif (scalar(@hashes) == 1) {
-               # single hash
-               return $hashes[0];
-       } else {
-               return \@hashes;
-       }
-}
-

 ## ......................................................................
 ## git utility functions, directly accessing git repository
 
 ## ......................................................................
 ## git utility functions, directly accessing git repository
 


@@ -765,7 +771,7 @@ sub git_get_references {
                open $fd, "$projectroot/$project/info/refs"
                        or return;
        } else {
                open $fd, "$projectroot/$project/info/refs"
                        or return;
        } else {

-               open $fd, "-|", $GIT, "ls-remote", "."
+               open $fd, "-|", git_cmd(), "ls-remote", "."

                        or return;
        }
 
                        or return;
        }
 


@@ -783,61 +789,10 @@ sub git_get_references {
        return \%refs;
 }
 
        return \%refs;
 }
 

-sub git_get_following_references {
-       my $hash = shift || return undef;
-       my $type = shift;
-       my $base = shift || $hash_base || "HEAD";
-
-       my $refs = git_get_references($type);
-       open my $fd, "-|", $GIT, "rev-list", $base
-               or return undef;
-       my @commits = map { chomp; $_ } <$fd>;
-       close $fd
-               or return undef;
-
-       my @reflist;
-       my $lastref;
-
-       foreach my $commit (@commits) {
-               foreach my $ref (@{$refs->{$commit}}) {
-                       $lastref = $ref;
-                       push @reflist, $lastref;
-               }
-               if ($commit eq $hash) {
-                       last;
-               }
-       }
-
-       return wantarray ? @reflist : $lastref;
-}
-
-sub git_get_preceding_references {
-       my $hash = shift || return undef;
-       my $type = shift;
-
-       my $refs = git_get_references($type);
-       open my $fd, "-|", $GIT, "rev-list", $hash
-               or return undef;
-       my @commits = map { chomp; $_ } <$fd>;
-       close $fd
-               or return undef;
-
-       my @reflist;
-
-       foreach my $commit (@commits) {
-               foreach my $ref (@{$refs->{$commit}}) {
-                       return $ref unless wantarray;
-                       push @reflist, $ref;
-               }
-       }
-
-       return @reflist;
-}
-

 sub git_get_rev_name_tags {
        my $hash = shift || return undef;
 
 sub git_get_rev_name_tags {
        my $hash = shift || return undef;
 

-       open my $fd, "-|", $GIT, "name-rev", "--tags", $hash
+       open my $fd, "-|", git_cmd(), "name-rev", "--tags", $hash

                or return;
        my $name_rev = <$fd>;
        close $fd;
                or return;
        my $name_rev = <$fd>;
        close $fd;


@@ -885,7 +840,7 @@ sub parse_tag {
        my %tag;
        my @comment;
 
        my %tag;
        my @comment;
 

-       open my $fd, "-|", $GIT, "cat-file", "tag", $tag_id or return;
+       open my $fd, "-|", git_cmd(), "cat-file", "tag", $tag_id or return;

        $tag{'id'} = $tag_id;
        while (my $line = <$fd>) {
                chomp $line;
        $tag{'id'} = $tag_id;
        while (my $line = <$fd>) {
                chomp $line;


@@ -926,7 +881,7 @@ sub parse_commit {
                @commit_lines = @$commit_text;
        } else {
                $/ = "\0";
                @commit_lines = @$commit_text;
        } else {
                $/ = "\0";

-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id
+               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", "--max-count=1", $commit_id

                        or return;
                @commit_lines = split '\n', <$fd>;
                close $fd or return;
                        or return;
                @commit_lines = split '\n', <$fd>;
                close $fd or return;


@@ -1074,9 +1029,30 @@ sub parse_difftree_raw_line {
                }
        }
        # 'c512b523472485aef4fff9e57b229d9d243c967f'
                }
        }
        # 'c512b523472485aef4fff9e57b229d9d243c967f'

-       #elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
-       #       $res{'commit'} = $1;
-       #}
+       elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
+               $res{'commit'} = $1;
+       }
+
+       return wantarray ? %res : \%res;
+}
+
+# parse line of git-ls-tree output
+sub parse_ls_tree_line ($;%) {
+       my $line = shift;
+       my %opts = @_;
+       my %res;
+
+       #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa  panic.c'
+       $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
+
+       $res{'mode'} = $1;
+       $res{'type'} = $2;
+       $res{'hash'} = $3;
+       if ($opts{'-z'}) {
+               $res{'name'} = $4;
+       } else {
+               $res{'name'} = unquote($4);
+       }

 
        return wantarray ? %res : \%res;
 }
 
        return wantarray ? %res : \%res;
 }


@@ -1248,6 +1224,9 @@ EOF
                       'href="%s" type="application/rss+xml"/>'."\n",
                       esc_param($project), href(action=>"rss"));
        }
                       'href="%s" type="application/rss+xml"/>'."\n",
                       esc_param($project), href(action=>"rss"));
        }

+       if (defined $favicon) {
+               print qq(<link rel="shortcut icon" href="$favicon" type="image/png"/>\n);
+       }

 
        print "</head>\n" .
              "<body>\n" .
 
        print "</head>\n" .
              "<body>\n" .


@@ -1401,6 +1380,24 @@ sub git_print_header_div {
              "\n</div>\n";
 }
 
              "\n</div>\n";
 }
 

+#sub git_print_authorship (\%) {
+sub git_print_authorship {
+       my $co = shift;
+
+       my %ad = parse_date($co->{'author_epoch'}, $co->{'author_tz'});
+       print "<div class=\"author_date\">" .
+             esc_html($co->{'author_name'}) .
+             " [$ad{'rfc2822'}";
+       if ($ad{'hour_local'} < 6) {
+               printf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
+                      $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+       } else {
+               printf(" (%02d:%02d %s)",
+                      $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
+       }
+       print "]</div>\n";
+}
+

 sub git_print_page_path {
        my $name = shift;
        my $type = shift;
 sub git_print_page_path {
        my $name = shift;
        my $type = shift;


@@ -1408,25 +1405,44 @@ sub git_print_page_path {
 
        if (!defined $name) {
                print "<div class=\"page_path\">/</div>\n";
 
        if (!defined $name) {
                print "<div class=\"page_path\">/</div>\n";

-       } elsif (defined $type && $type eq 'blob') {
+       } else {
+               my @dirname = split '/', $name;
+               my $basename = pop @dirname;
+               my $fullname = '';
+

                print "<div class=\"page_path\">";
                print "<div class=\"page_path\">";

-               if (defined $hb) {
+               foreach my $dir (@dirname) {
+                       $fullname .= $dir . '/';
+                       print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
+                                                    hash_base=>$hb),
+                                     -title => $fullname}, esc_html($dir));
+                       print "/";
+               }
+               if (defined $type && $type eq 'blob') {

                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,

-                                                    hash_base=>$hb)},
-                                     esc_html($name));
+                                                    hash_base=>$hb),
+                                     -title => $name}, esc_html($basename));
+               } elsif (defined $type && $type eq 'tree') {
+                       print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
+                                                    hash_base=>$hb),
+                                     -title => $name}, esc_html($basename));
+                       print "/";

                } else {
                } else {

-                       print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name)},
-                                     esc_html($name));
+                       print esc_html($basename);

                }
                print "<br/></div>\n";
                }
                print "<br/></div>\n";

-       } else {
-               print "<div class=\"page_path\">" . esc_html($name) . "<br/></div>\n";

        }
 }
 
        }
 }
 

-sub git_print_log {
+# sub git_print_log (\@;%) {
+sub git_print_log ($;%) {

        my $log = shift;
        my $log = shift;

+       my %opts = @_;

 
 

+       if ($opts{'-remove_title'}) {
+               # remove title, i.e. first line of log
+               shift @$log;
+       }

        # remove leading empty lines
        while (defined $log->[0] && $log->[0] eq "") {
                shift @$log;
        # remove leading empty lines
        while (defined $log->[0] && $log->[0] eq "") {
                shift @$log;


@@ -1436,6 +1452,20 @@ sub git_print_log {
        my $signoff = 0;
        my $empty = 0;
        foreach my $line (@$log) {
        my $signoff = 0;
        my $empty = 0;
        foreach my $line (@$log) {

+               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
+                       $signoff = 1;
+                       $empty = 0;
+                       if (! $opts{'-remove_signoff'}) {
+                               print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
+                               next;
+                       } else {
+                               # remove signoff lines
+                               next;
+                       }
+               } else {
+                       $signoff = 0;
+               }
+

                # print only one empty line
                # do not print empty line after signoff
                if ($line eq "") {
                # print only one empty line
                # do not print empty line after signoff
                if ($line eq "") {


@@ -1444,13 +1474,13 @@ sub git_print_log {
                } else {
                        $empty = 0;
                }
                } else {
                        $empty = 0;
                }

-               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                       $signoff = 1;
-                       print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
-               } else {
-                       $signoff = 0;
-                       print format_log_line_html($line) . "<br/>\n";
-               }
+
+               print format_log_line_html($line) . "<br/>\n";
+       }
+
+       if ($opts{'-final_empty_line'}) {
+               # end with single empty line
+               print "<br/>\n" unless $empty;

        }
 }
 
        }
 }
 


@@ -1458,30 +1488,65 @@ sub git_print_simplified_log {
        my $log = shift;
        my $remove_title = shift;
 
        my $log = shift;
        my $remove_title = shift;
 

-       shift @$log if $remove_title;
-       # remove leading empty lines
-       while (defined $log->[0] && $log->[0] eq "") {
-               shift @$log;
-       }
+       git_print_log($log,
+               -final_empty_line=> 1,
+               -remove_title => $remove_title);
+}

 
 

-       # simplify and print log
-       my $empty = 0;
-       foreach my $line (@$log) {
-               # remove signoff lines
-               if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
-                       next;
+# print tree entry (row of git_tree), but without encompassing <tr> element
+sub git_print_tree_entry {
+       my ($t, $basedir, $hash_base, $have_blame) = @_;
+
+       my %base_key = ();
+       $base_key{hash_base} = $hash_base if defined $hash_base;
+
+       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");
+               if ($have_blame) {
+                       print " | " .
+                               $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
+                                                      file_name=>"$basedir$t->{'name'}", %base_key)},
+                                       "blame");

                }
                }

-               # print only one empty line
-               if ($line eq "") {
-                       next if $empty;
-                       $empty = 1;
-               } else {
-                       $empty = 0;
+               if (defined $hash_base) {
+                       print " | " .
+                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                    hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
+                                     "history");

                }
                }

-               print format_log_line_html($line) . "<br/>\n";
+               print " | " .
+                     $cgi->a({-href => href(action=>"blob_plain",
+                                            hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
+                             "raw") .
+                     "</td>\n";
+
+       } 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'},
+                                            file_name=>"$basedir$t->{'name'}", %base_key)},
+                             "tree");
+               if (defined $hash_base) {
+                       print " | " .
+                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
+                                                    file_name=>"$basedir$t->{'name'}")},
+                                     "history");
+               }
+               print "</td>\n";

        }
        }

-       # end with single empty line
-       print "<br/>\n" unless $empty;

 }
 
 ## ......................................................................
 }
 
 ## ......................................................................


@@ -1498,6 +1563,7 @@ sub git_difftree_body {
 
        print "<table class=\"diff_tree\">\n";
        my $alternate = 0;
 
        print "<table class=\"diff_tree\">\n";
        my $alternate = 0;

+       my $patchno = 0;

        foreach my $line (@{$difftree}) {
                my %diff = parse_difftree_raw_line($line);
 
        foreach my $line (@{$difftree}) {
                my %diff = parse_difftree_raw_line($line);
 


@@ -1538,8 +1604,14 @@ sub git_difftree_body {
                              "<td class=\"link\">" .
                              $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                     hash_base=>$hash, file_name=>$diff{'file'})},
                              "<td class=\"link\">" .
                              $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                     hash_base=>$hash, file_name=>$diff{'file'})},

-                                     "blob") .
-                             "</td>\n";
+                                     "blob");
+                       if ($action eq 'commitdiff') {
+                               # link to patch
+                               $patchno++;
+                               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>";
 
                } elsif ($diff{'status'} eq "D") { # deleted
                        my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";


@@ -1553,9 +1625,15 @@ sub git_difftree_body {
                              $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                     hash_base=>$parent, file_name=>$diff{'file'})},
                                      "blob") .
                              $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
                                                     hash_base=>$parent, file_name=>$diff{'file'})},
                                      "blob") .

-                             " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$parent,
-                                                    file_name=>$diff{'file'})},\
+                             " | ";
+                       if ($action eq 'commitdiff') {
+                               # link to patch
+                               $patchno++;
+                               print " | " .
+                                     $cgi->a({-href => "#patch$patchno"}, "patch");
+                       }
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                                    file_name=>$diff{'file'})},

                                      "history") .
                              "</td>\n";
 
                                      "history") .
                              "</td>\n";
 


@@ -1590,16 +1668,23 @@ sub git_difftree_body {
                        print "</td>\n" .
                              "<td>$mode_chnge</td>\n" .
                              "<td class=\"link\">" .
                        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");
+                             $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff{'file'})},
+                                     "blob");

                        if ($diff{'to_id'} ne $diff{'from_id'}) { # modified
                        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'})},
-                                               "diff");
+                               if ($action eq 'commitdiff') {
+                                       # link to patch
+                                       $patchno++;
+                                       print " | " .
+                                               $cgi->a({-href => "#patch$patchno"}, "patch");
+                               } 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=>"history",
                        }
                        print " | " .
                                $cgi->a({-href => href(action=>"history",


@@ -1629,12 +1714,19 @@ sub git_difftree_body {
                                                     hash=>$diff{'to_id'}, file_name=>$diff{'to_file'})},
                                      "blob");
                        if ($diff{'to_id'} ne $diff{'from_id'}) {
                                                     hash=>$diff{'to_id'}, file_name=>$diff{'to_file'})},
                                      "blob");
                        if ($diff{'to_id'} ne $diff{'from_id'}) {

-                               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");
+                               if ($action eq 'commitdiff') {
+                                       # link to patch
+                                       $patchno++;
+                                       print " | " .
+                                               $cgi->a({-href => "#patch$patchno"}, "patch");
+                               } 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 "</td>\n";
 
                        }
                        print "</td>\n";
 


@@ -1655,7 +1747,7 @@ sub git_patchset_body {
        print "<div class=\"patchset\">\n";
 
        LINE:
        print "<div class=\"patchset\">\n";
 
        LINE:

-       while (my $patch_line @$fd>) {
+       while (my $patch_line = <$fd>) {

                chomp $patch_line;
 
                if ($patch_line =~ m/^diff /) { # "git diff" header
                chomp $patch_line;
 
                if ($patch_line =~ m/^diff /) { # "git diff" header


@@ -1667,7 +1759,7 @@ sub git_patchset_body {
                                # first patch in patchset
                                $patch_found = 1;
                        }
                                # first patch in patchset
                                $patch_found = 1;
                        }

-                       print "<div class=\"patch\">\n";
+                       print "<div class=\"patch\" id=\"patch". ($patch_idx+1) ."\">\n";

 
                        if (ref($difftree->[$patch_idx]) eq "HASH") {
                                $diffinfo = $difftree->[$patch_idx];
 
                        if (ref($difftree->[$patch_idx]) eq "HASH") {
                                $diffinfo = $difftree->[$patch_idx];


@@ -1975,77 +2067,6 @@ sub git_heads_body {
        print "</table>\n";
 }
 
        print "</table>\n";
 }
 

-## ----------------------------------------------------------------------
-## functions printing large fragments, format as one of arguments
-
-sub git_diff_print {
-       my $from = shift;
-       my $from_name = shift;
-       my $to = shift;
-       my $to_name = shift;
-       my $format = shift || "html";
-
-       my $from_tmp = "/dev/null";
-       my $to_tmp = "/dev/null";
-       my $pid = $$;
-
-       # create tmp from-file
-       if (defined $from) {
-               $from_tmp = "$git_temp/gitweb_" . $$ . "_from";
-               open my $fd2, "> $from_tmp";
-               open my $fd, "-|", $GIT, "cat-file", "blob", $from;
-               my @file = <$fd>;
-               print $fd2 @file;
-               close $fd2;
-               close $fd;
-       }
-
-       # create tmp to-file
-       if (defined $to) {
-               $to_tmp = "$git_temp/gitweb_" . $$ . "_to";
-               open my $fd2, "> $to_tmp";
-               open my $fd, "-|", $GIT, "cat-file", "blob", $to;
-               my @file = <$fd>;
-               print $fd2 @file;
-               close $fd2;
-               close $fd;
-       }
-
-       open my $fd, "-|", "/usr/bin/diff -u -p -L \'$from_name\' -L \'$to_name\' $from_tmp $to_tmp";
-       if ($format eq "plain") {
-               undef $/;
-               print <$fd>;
-               $/ = "\n";
-       } else {
-               while (my $line = <$fd>) {
-                       chomp $line;
-                       my $char = substr($line, 0, 1);
-                       my $diff_class = "";
-                       if ($char eq '+') {
-                               $diff_class = " add";
-                       } elsif ($char eq "-") {
-                               $diff_class = " rem";
-                       } elsif ($char eq "@") {
-                               $diff_class = " chunk_header";
-                       } elsif ($char eq "\\") {
-                               # skip errors
-                               next;
-                       }
-                       $line = untabify($line);
-                       print "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
-               }
-       }
-       close $fd;
-
-       if (defined $from) {
-               unlink($from_tmp);
-       }
-       if (defined $to) {
-               unlink($to_tmp);
-       }
-}
-
-

 ## ======================================================================
 ## ======================================================================
 ## actions
 ## ======================================================================
 ## ======================================================================
 ## actions


@@ -2066,7 +2087,7 @@ sub git_project_list {
                if (!defined $head) {
                        next;
                }
                if (!defined $head) {
                        next;
                }

-               $ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}";
+               $git_dir = "$projectroot/$pr->{'path'}";

                my %co = parse_commit($head);
                if (!%co) {
                        next;
                my %co = parse_commit($head);
                if (!%co) {
                        next;


@@ -2185,7 +2206,8 @@ sub git_summary {
        }
        print "</table>\n";
 
        }
        print "</table>\n";
 

-       open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_get_head_hash($project)
+       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=17",
+               git_get_head_hash($project)

                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;


@@ -2247,7 +2269,8 @@ sub git_blame2 {
        my $fd;
        my $ftype;
 
        my $fd;
        my $ftype;
 

-       if (!gitweb_check_feature('blame')) {
+       my ($have_blame) = gitweb_check_feature('blame');
+       if (!$have_blame) {

                die_error('403 Permission denied', "Permission denied");
        }
        die_error('404 Not Found', "File name not defined") if (!$file_name);
                die_error('403 Permission denied', "Permission denied");
        }
        die_error('404 Not Found', "File name not defined") if (!$file_name);


@@ -2263,7 +2286,7 @@ 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, "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 =
                or die_error(undef, "Open git-blame failed");
        git_header_html();
        my $formats_nav =


@@ -2316,7 +2339,8 @@ HTML
 sub git_blame {
        my $fd;
 
 sub git_blame {
        my $fd;
 

-       if (!gitweb_check_feature('blame')) {
+       my ($have_blame) = gitweb_check_feature('blame');
+       if (!$have_blame) {

                die_error('403 Permission denied', "Permission denied");
        }
        die_error('404 Not Found', "File name not defined") if (!$file_name);
                die_error('403 Permission denied', "Permission denied");
        }
        die_error('404 Not Found', "File name not defined") if (!$file_name);


@@ -2328,7 +2352,7 @@ sub git_blame {
                $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
                        or die_error(undef, "Error lookup file");
        }
                $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
                        or die_error(undef, "Error lookup file");
        }

-       open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
+       open ($fd, "-|", git_cmd(), "annotate", '-l', '-t', '-r', $file_name, $hash_base)

                or die_error(undef, "Open git-annotate failed");
        git_header_html();
        my $formats_nav =
                or die_error(undef, "Open git-annotate failed");
        git_header_html();
        my $formats_nav =


@@ -2368,7 +2392,7 @@ HTML
                chomp $line;
                $line_class_num = ($line_class_num + 1) % $line_class_len;
 
                chomp $line;
                $line_class_num = ($line_class_num + 1) % $line_class_len;
 

-               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) \+\d\d\d\d\t(\d+)\)(.*)$/) {
+               if ($line =~ m/^([0-9a-fA-F]{40})\t\(\s*([^\t]+)\t(\d+) [+-]\d\d\d\d\t(\d+)\)(.*)$/) {

                        $long_rev = $1;
                        $author   = $2;
                        $time     = $3;
                        $long_rev = $1;
                        $author   = $2;
                        $time     = $3;


@@ -2433,6 +2457,12 @@ sub git_heads {
 }
 
 sub git_blob_plain {
 }
 
 sub git_blob_plain {

+       # blobs defined by non-textual hash id's can be cached
+       my $expires;
+       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               $expires = "+1d";
+       }
+

        if (!defined $hash) {
                if (defined $file_name) {
                        my $base = $hash_base || git_get_head_hash($project);
        if (!defined $hash) {
                if (defined $file_name) {
                        my $base = $hash_base || git_get_head_hash($project);


@@ -2443,7 +2473,7 @@ sub git_blob_plain {
                }
        }
        my $type = shift;
                }
        }
        my $type = shift;

-       open my $fd, "-|", $GIT, "cat-file", "blob", $hash
+       open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash

                or die_error(undef, "Couldn't cat $file_name, $hash");
 
        $type ||= blob_mimetype($fd, $file_name);
                or die_error(undef, "Couldn't cat $file_name, $hash");
 
        $type ||= blob_mimetype($fd, $file_name);


@@ -2456,8 +2486,10 @@ sub git_blob_plain {
                $save_as .= '.txt';
        }
 
                $save_as .= '.txt';
        }
 

-       print $cgi->header(-type => "$type",
-                          -content_disposition => "inline; filename=\"$save_as\"");
+       print $cgi->header(
+               -type => "$type",
+               -expires=>$expires,
+               -content_disposition => "inline; filename=\"$save_as\"");

        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;
        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;


@@ -2467,6 +2499,12 @@ sub git_blob_plain {
 }
 
 sub git_blob {
 }
 
 sub git_blob {

+       # blobs defined by non-textual hash id's can be cached
+       my $expires;
+       if ($hash =~ m/^[0-9a-fA-F]{40}$/) {
+               $expires = "+1d";
+       }
+

        if (!defined $hash) {
                if (defined $file_name) {
                        my $base = $hash_base || git_get_head_hash($project);
        if (!defined $hash) {
                if (defined $file_name) {
                        my $base = $hash_base || git_get_head_hash($project);


@@ -2476,15 +2514,15 @@ sub git_blob {
                        die_error(undef, "No file name defined");
                }
        }
                        die_error(undef, "No file name defined");
                }
        }

-       my $have_blame = gitweb_check_feature('blame');
-       open my $fd, "-|", $GIT, "cat-file", "blob", $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");
        my $mimetype = blob_mimetype($fd, $file_name);
        if ($mimetype !~ m/^text\//) {
                close $fd;
                return git_blob_plain($mimetype);
        }
                or die_error(undef, "Couldn't cat $file_name, $hash");
        my $mimetype = blob_mimetype($fd, $file_name);
        if ($mimetype !~ m/^text\//) {
                close $fd;
                return git_blob_plain($mimetype);
        }

-       git_header_html();
+       git_header_html(undef, $expires);

        my $formats_nav = '';
        if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                if (defined $file_name) {
        my $formats_nav = '';
        if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                if (defined $file_name) {


@@ -2542,7 +2580,7 @@ sub git_tree {
                }
        }
        $/ = "\0";
                }
        }
        $/ = "\0";

-       open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
+       open my $fd, "-|", git_cmd(), "ls-tree", '-z', $hash

                or die_error(undef, "Open git-ls-tree failed");
        my @entries = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading tree failed");
                or die_error(undef, "Open git-ls-tree failed");
        my @entries = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading tree failed");


@@ -2551,14 +2589,13 @@ sub git_tree {
        my $refs = git_get_references();
        my $ref = format_ref_marker($refs, $hash_base);
        git_header_html();
        my $refs = git_get_references();
        my $ref = format_ref_marker($refs, $hash_base);
        git_header_html();

-       my %base_key = ();

        my $base = "";
        my $base = "";

-       my $have_blame = gitweb_check_feature('blame');
+       my ($have_blame) = gitweb_check_feature('blame');

        if (defined $hash_base && (my %co = parse_commit($hash_base))) {
        if (defined $hash_base && (my %co = parse_commit($hash_base))) {

-               $base_key{hash_base} = $hash_base;

                git_print_page_nav('tree','', $hash_base);
                git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
        } else {
                git_print_page_nav('tree','', $hash_base);
                git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
        } else {

+               undef $hash_base;

                print "<div class=\"page_nav\">\n";
                print "<br/><br/></div>\n";
                print "<div class=\"title\">$hash</div>\n";
                print "<div class=\"page_nav\">\n";
                print "<br/><br/></div>\n";
                print "<div class=\"title\">$hash</div>\n";


@@ -2571,54 +2608,17 @@ sub git_tree {
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        foreach my $line (@entries) {
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        foreach my $line (@entries) {

-               #'100644        blob    0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa        panic.c'
-               $line =~ m/^([0-9]+) (.+) ([0-9a-fA-F]{40})\t(.+)$/;
-               my $t_mode = $1;
-               my $t_type = $2;
-               my $t_hash = $3;
-               my $t_name = validate_input($4);
+               my %t = parse_ls_tree_line($line, -z => 1);
+

                if ($alternate) {
                        print "<tr class=\"dark\">\n";
                } else {
                        print "<tr class=\"light\">\n";
                }
                $alternate ^= 1;
                if ($alternate) {
                        print "<tr class=\"dark\">\n";
                } else {
                        print "<tr class=\"light\">\n";
                }
                $alternate ^= 1;

-               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=>"$base$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=>"$base$t_name", %base_key)},
-                                     "blob");
-                       if ($have_blame) {
-                               print " | " .
-                                       $cgi->a({-href => href(action=>"blame", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                               "blame");
-                       }
-                       print " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base,
-                                                    hash=>$t_hash, file_name=>"$base$t_name")},
-                                     "history") .
-                             " | " .
-                             $cgi->a({-href => href(action=>"blob_plain",
-                                                    hash=>$t_hash, file_name=>"$base$t_name")},
-                                     "raw") .
-                             "</td>\n";
-               } elsif ($t_type eq "tree") {
-                       print "<td class=\"list\">" .
-                             $cgi->a({-href => href(action=>"tree", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                     esc_html($t_name)) .
-                             "</td>\n" .
-                             "<td class=\"link\">" .
-                             $cgi->a({-href => href(action=>"tree", hash=>$t_hash, file_name=>"$base$t_name", %base_key)},
-                                     "tree") .
-                             " | " .
-                             $cgi->a({-href => href(action=>"history", hash_base=>$hash_base, file_name=>"$base$t_name")},
-                                     "history") .
-                             "</td>\n";
-               }
+
+               git_print_tree_entry(\%t, $base, $hash_base, $have_blame);
+

                print "</tr>\n";
        }
        print "</table>\n" .
                print "</tr>\n";
        }
        print "</table>\n" .


@@ -2645,7 +2645,8 @@ sub git_snapshot {
                           -content_disposition => "inline; filename=\"$filename\"",
                           -status => '200 OK');
 
                           -content_disposition => "inline; filename=\"$filename\"",
                           -status => '200 OK');
 

-       open my $fd, "-|", "$GIT tar-tree $hash \'$project\' | $command" or
+       my $git_command = git_cmd_str();
+       open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or

                die_error(undef, "Execute git-tar-tree failed.");
        binmode STDOUT, ':raw';
        print <$fd>;
                die_error(undef, "Execute git-tar-tree failed.");
        binmode STDOUT, ':raw';
        print <$fd>;


@@ -2665,7 +2666,7 @@ sub git_log {
        my $refs = git_get_references();
 
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
        my $refs = git_get_references();
 
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));

-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash

                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;


@@ -2720,7 +2721,7 @@ sub git_commit {
        if (!defined $parent) {
                $parent = "--root";
        }
        if (!defined $parent) {
                $parent = "--root";
        }

-       open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
+       open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $parent, $hash

                or die_error(undef, "Open git-diff-tree failed");
        my @difftree = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading git-diff-tree failed");
                or die_error(undef, "Open git-diff-tree failed");
        my @difftree = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading git-diff-tree failed");


@@ -2798,7 +2799,7 @@ sub git_commit {
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
                      " | " .
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"commit", hash=>$par)}, "commit") .
                      " | " .

-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "commitdiff") .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$hash, hash_parent=>$par)}, "diff") .

                      "</td>" .
                      "</tr>\n";
        }
                      "</td>" .
                      "</tr>\n";
        }


@@ -2827,7 +2828,7 @@ sub git_blobdiff {
        if (defined $hash_base && defined $hash_parent_base) {
                if (defined $file_name) {
                        # read raw output
        if (defined $hash_base && defined $hash_parent_base) {
                if (defined $file_name) {
                        # read raw output

-                       open $fd, "-|", $GIT, "diff-tree", '-r', '-M', '-C', $hash_parent_base, $hash_base,
+                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base,

                                "--", $file_name
                                or die_error(undef, "Open git-diff-tree failed");
                        @difftree = map { chomp; $_ } <$fd>;
                                "--", $file_name
                                or die_error(undef, "Open git-diff-tree failed");
                        @difftree = map { chomp; $_ } <$fd>;


@@ -2836,13 +2837,12 @@ sub git_blobdiff {
                        @difftree
                                or die_error('404 Not Found', "Blob diff not found");
 
                        @difftree
                                or die_error('404 Not Found', "Blob diff not found");
 

-               } elsif (defined $hash) { # try to find filename from $hash
-                       if ($hash !~ /[0-9a-fA-F]{40}/) {
-                               $hash = git_to_hash($hash);
-                       }
+               } elsif (defined $hash &&
+                        $hash =~ /[0-9a-fA-F]{40}/) {
+                       # try to find filename from $hash

 
                        # read filtered raw output
 
                        # read filtered raw output

-                       open $fd, "-|", $GIT, "diff-tree", '-r', '-M', '-C', $hash_parent_base, $hash_base
+                       open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, $hash_parent_base, $hash_base

                                or die_error(undef, "Open git-diff-tree failed");
                        @difftree =
                                # ':100644 100644 03b21826... 3b93d5e7... M     ls-files.c'
                                or die_error(undef, "Open git-diff-tree failed");
                        @difftree =
                                # ':100644 100644 03b21826... 3b93d5e7... M     ls-files.c'


@@ -2876,7 +2876,8 @@ sub git_blobdiff {
                }
 
                # open patch output
                }
 
                # open patch output

-               open $fd, "-|", $GIT, "diff-tree", '-r', '-p', '-M', '-C', $hash_parent_base, $hash_base,
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       '-p', $hash_parent_base, $hash_base,

                        "--", $file_name
                        or die_error(undef, "Open git-diff-tree failed");
        }
                        "--", $file_name
                        or die_error(undef, "Open git-diff-tree failed");
        }


@@ -2911,8 +2912,7 @@ sub git_blobdiff {
                }
 
                # open patch output
                }
 
                # open patch output

-               #open $fd, "-|", $GIT, "diff", '-p', $hash_parent, $hash
-               open $fd, "-|", $GIT, "diff", '-p', $hash, $hash_parent
+               open $fd, "-|", git_cmd(), "diff", '-p', @diff_opts, $hash_parent, $hash

                        or die_error(undef, "Open git-diff failed");
        } else  {
                die_error('404 Not Found', "Missing one of the blob diff parameters")
                        or die_error(undef, "Open git-diff failed");
        } else  {
                die_error('404 Not Found', "Missing one of the blob diff parameters")


@@ -2997,7 +2997,7 @@ sub git_commitdiff {
        my $fd;
        my @difftree;
        if ($format eq 'html') {
        my $fd;
        my @difftree;
        if ($format eq 'html') {

-               open $fd, "-|", $GIT, "diff-tree", '-r', '-M', '-C',
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,

                        "--patch-with-raw", "--full-index", $hash_parent, $hash
                        or die_error(undef, "Open git-diff-tree failed");
 
                        "--patch-with-raw", "--full-index", $hash_parent, $hash
                        or die_error(undef, "Open git-diff-tree failed");
 


@@ -3008,7 +3008,8 @@ sub git_commitdiff {
                }
 
        } elsif ($format eq 'plain') {
                }
 
        } elsif ($format eq 'plain') {

-               open $fd, "-|", $GIT, "diff-tree", '-r', '-p', '-B', $hash_parent, $hash
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       '-p', $hash_parent, $hash

                        or die_error(undef, "Open git-diff-tree failed");
 
        } else {
                        or die_error(undef, "Open git-diff-tree failed");
 
        } else {


@@ -3033,6 +3034,7 @@ sub git_commitdiff {
                git_header_html(undef, $expires);
                git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
                git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);
                git_header_html(undef, $expires);
                git_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);
                git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);

+               git_print_authorship(\%co);

                print "<div class=\"page_body\">\n";
                print "<div class=\"log\">\n";
                git_print_simplified_log($co{'comment'}, 1); # skip title
                print "<div class=\"page_body\">\n";
                print "<div class=\"log\">\n";
                git_print_simplified_log($co{'comment'}, 1); # skip title


@@ -3065,8 +3067,8 @@ TEXT
 
        # write patch
        if ($format eq 'html') {
 
        # write patch
        if ($format eq 'html') {

-               #git_difftree_body(\@difftree, $hash, $hash_parent);
-               #print "<br/>\n";
+               git_difftree_body(\@difftree, $hash, $hash_parent);
+               print "<br/>\n";

 
                git_patchset_body($fd, \@difftree, $hash, $hash_parent);
                close $fd;
 
                git_patchset_body($fd, \@difftree, $hash, $hash_parent);
                close $fd;


@@ -3107,7 +3109,8 @@ sub git_history {
        git_print_page_path($file_name, $ftype, $hash_base);
 
        open my $fd, "-|",
        git_print_page_path($file_name, $ftype, $hash_base);
 
        open my $fd, "-|",

-               $GIT, "rev-list", "--full-history", $hash_base, "--", $file_name;
+               git_cmd(), "rev-list", "--full-history", $hash_base, "--", $file_name;
+

        git_history_body($fd, $refs, $hash_base, $ftype);
 
        close $fd;
        git_history_body($fd, $refs, $hash_base, $ftype);
 
        close $fd;


@@ -3147,7 +3150,7 @@ sub git_search {
        my $alternate = 0;
        if ($commit_search) {
                $/ = "\0";
        my $alternate = 0;
        if ($commit_search) {
                $/ = "\0";

-               open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash or next;
+               open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", $hash or next;

                while (my $commit_text = <$fd>) {
                        if (!grep m/$searchtext/i, $commit_text) {
                                next;
                while (my $commit_text = <$fd>) {
                        if (!grep m/$searchtext/i, $commit_text) {
                                next;


@@ -3199,7 +3202,9 @@ sub git_search {
 
        if ($pickaxe_search) {
                $/ = "\n";
 
        if ($pickaxe_search) {
                $/ = "\n";

-               open my $fd, "-|", "$GIT rev-list $hash | $GIT diff-tree -r --stdin -S\'$searchtext\'";
+               my $git_command = git_cmd_str();
+               open my $fd, "-|", "$git_command rev-list $hash | " .
+                       "$git_command diff-tree -r --stdin -S\'$searchtext\'";

                undef %co;
                my @files;
                while (my $line = <$fd>) {
                undef %co;
                my @files;
                while (my $line = <$fd>) {


@@ -3266,7 +3271,7 @@ sub git_shortlog {
        my $refs = git_get_references();
 
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
        my $refs = git_get_references();
 
        my $limit = sprintf("--max-count=%i", (100 * ($page+1)));

-       open my $fd, "-|", $GIT, "rev-list", $limit, $hash
+       open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash

                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd;


@@ -3294,7 +3299,7 @@ sub git_shortlog {
 
 sub git_rss {
        # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
 
 sub git_rss {
        # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ

-       open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_get_head_hash($project)
+       open my $fd, "-|", git_cmd(), "rev-list", "--max-count=150", git_get_head_hash($project)

                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading git-rev-list failed");
                or die_error(undef, "Open git-rev-list failed");
        my @revlist = map { chomp; $_ } <$fd>;
        close $fd or die_error(undef, "Reading git-rev-list failed");


@@ -3317,9 +3322,12 @@ XML
                        last;
                }
                my %cd = parse_date($co{'committer_epoch'});
                        last;
                }
                my %cd = parse_date($co{'committer_epoch'});

-               open $fd, "-|", $GIT, "diff-tree", '-r', $co{'parent'}, $co{'id'} or next;
+               open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
+                       $co{'parent'}, $co{'id'}
+                       or next;

                my @difftree = map { chomp; $_ } <$fd>;
                my @difftree = map { chomp; $_ } <$fd>;

-               close $fd or next;
+               close $fd
+                       or next;

                print "<item>\n" .
                      "<title>" .
                      sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . esc_html($co{'title'}) .
                print "<item>\n" .
                      "<title>" .
                      sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . esc_html($co{'title'}) .


@@ -3372,7 +3380,7 @@ XML
                if (!defined $head) {
                        next;
                }
                if (!defined $head) {
                        next;
                }

-               $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}";
+               $git_dir = "$projectroot/$proj{'path'}";

                my %co = parse_commit($head);
                if (!%co) {
                        next;
                my %co = parse_commit($head);
                if (!%co) {
                        next;