gitweb: Show "no difference" message for empty diff

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index d03b97b1221ac25f1e52a4e5e1ce4451d4a8a5fd479b68bdfc95845876fdc250..b40fd35dc10b85f39687b1ae960d28da320f860fd1754ea5882de9303a621cfd 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -19,7 +19,7 @@ use File::Basename qw(basename);
 binmode STDOUT, ':utf8';
 
 BEGIN {
 binmode STDOUT, ':utf8';
 
 BEGIN {

-       CGI->compile() if $ENV{MOD_PERL};
+       CGI->compile() if $ENV{'MOD_PERL'};

 }
 
 our $cgi = new CGI;
 }
 
 our $cgi = new CGI;


@@ -72,6 +72,10 @@ our $logo_label = "git homepage";
 # source of projects list
 our $projects_list = "++GITWEB_LIST++";
 
 # source of projects list
 our $projects_list = "++GITWEB_LIST++";
 

+# default order of projects list
+# valid values are none, project, descr, owner, and age
+our $default_projects_order = "project";
+

 # show repository only if this file exists
 # (only effective if this variable evaluates to true)
 our $export_ok = "++GITWEB_EXPORT_OK++";
 # show repository only if this file exists
 # (only effective if this variable evaluates to true)
 our $export_ok = "++GITWEB_EXPORT_OK++";


@@ -177,8 +181,8 @@ our %feature = (
        # projects matching $projname/*.git will not be shown in the main
        # projects list, instead a '+' mark will be added to $projname
        # there and a 'forks' view will be enabled for the project, listing
        # projects matching $projname/*.git will not be shown in the main
        # projects list, instead a '+' mark will be added to $projname
        # there and a 'forks' view will be enabled for the project, listing

-       # all the forks. This feature is supported only if project list
-       # is taken from a directory, not file.
+       # all the forks. If project list is taken from a file, forks have
+       # to be listed after the main project.

 
        # To enable system wide have in $GITWEB_CONFIG
        # $feature{'forks'}{'default'} = [1];
 
        # To enable system wide have in $GITWEB_CONFIG
        # $feature{'forks'}{'default'} = [1];


@@ -592,7 +596,7 @@ sub esc_html ($;%) {
        my %opts = @_;
 
        $str = to_utf8($str);
        my %opts = @_;
 
        $str = to_utf8($str);

-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);

        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }


@@ -606,7 +610,7 @@ sub esc_path {
        my %opts = @_;
 
        $str = to_utf8($str);
        my %opts = @_;
 
        $str = to_utf8($str);

-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);

        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }


@@ -835,7 +839,7 @@ sub file_type_long {
 
 ## ----------------------------------------------------------------------
 ## functions returning short HTML fragments, or transforming HTML fragments
 
 ## ----------------------------------------------------------------------
 ## functions returning short HTML fragments, or transforming HTML fragments

-## which don't beling to other sections
+## which don't belong to other sections

 
 # format line of commit message.
 sub format_log_line_html {
 
 # format line of commit message.
 sub format_log_line_html {


@@ -987,7 +991,7 @@ sub git_get_project_config {
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 

-       my @x = (git_cmd(), 'repo-config');
+       my @x = (git_cmd(), 'config');

        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";
        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";


@@ -1048,6 +1052,8 @@ sub git_get_projects_list {
        $filter ||= '';
        $filter =~ s/\.git$//;
 
        $filter ||= '';
        $filter =~ s/\.git$//;
 

+       my ($check_forks) = gitweb_check_feature('forks');
+

        if (-d $projects_list) {
                # search in directory
                my $dir = $projects_list . ($filter ? "/$filter" : '');
        if (-d $projects_list) {
                # search in directory
                my $dir = $projects_list . ($filter ? "/$filter" : '');


@@ -1055,8 +1061,6 @@ sub git_get_projects_list {
                $dir =~ s!/+$!!;
                my $pfxlen = length("$dir");
 
                $dir =~ s!/+$!!;
                my $pfxlen = length("$dir");
 

-               my ($check_forks) = gitweb_check_feature('forks');
-

                File::Find::find({
                        follow_fast => 1, # follow symbolic links
                        dangling_symlinks => 0, # ignore dangling symlinks, silently
                File::Find::find({
                        follow_fast => 1, # follow symbolic links
                        dangling_symlinks => 0, # ignore dangling symlinks, silently


@@ -1082,7 +1086,9 @@ 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'

+               my %paths;

                open my ($fd), $projects_list or return;
                open my ($fd), $projects_list or return;

+       PROJECT:

                while (my $line = <$fd>) {
                        chomp $line;
                        my ($path, $owner) = split ' ', $line;
                while (my $line = <$fd>) {
                        chomp $line;
                        my ($path, $owner) = split ' ', $line;


@@ -1095,11 +1101,27 @@ sub git_get_projects_list {
                                # looking for forks;
                                my $pfx = substr($path, 0, length($filter));
                                if ($pfx ne $filter) {
                                # looking for forks;
                                my $pfx = substr($path, 0, length($filter));
                                if ($pfx ne $filter) {

-                                       next;
+                                       next PROJECT;

                                }
                                my $sfx = substr($path, length($filter));
                                if ($sfx !~ /^\/.*\.git$/) {
                                }
                                my $sfx = substr($path, length($filter));
                                if ($sfx !~ /^\/.*\.git$/) {

-                                       next;
+                                       next PROJECT;
+                               }
+                       } elsif ($check_forks) {
+                       PATH:
+                               foreach my $filter (keys %paths) {
+                                       # looking for forks;
+                                       my $pfx = substr($path, 0, length($filter));
+                                       if ($pfx ne $filter) {
+                                               next PATH;
+                                       }
+                                       my $sfx = substr($path, length($filter));
+                                       if ($sfx !~ /^\/.*\.git$/) {
+                                               next PATH;
+                                       }
+                                       # is a fork, don't include it in
+                                       # the list
+                                       next PROJECT;

                                }
                        }
                        if (check_export_ok("$projectroot/$path")) {
                                }
                        }
                        if (check_export_ok("$projectroot/$path")) {


@@ -1107,12 +1129,13 @@ sub git_get_projects_list {
                                        path => $path,
                                        owner => to_utf8($owner),
                                };
                                        path => $path,
                                        owner => to_utf8($owner),
                                };

-                               push @list, $pr
+                               push @list, $pr;
+                               (my $forks_path = $path) =~ s/\.git$//;
+                               $paths{$forks_path}++;

                        }
                }
                close $fd;
        }
                        }
                }
                close $fd;
        }

-       @list = sort {$a->{'path'} cmp $b->{'path'}} @list;

        return @list;
 }
 
        return @list;
 }
 


@@ -1691,7 +1714,7 @@ sub git_header_html {
 
        my $title = "$site_name";
        if (defined $project) {
 
        my $title = "$site_name";
        if (defined $project) {

-               $title .= " - $project";
+               $title .= " - " . to_utf8($project);

                if (defined $action) {
                        $title .= "/$action";
                        if (defined $file_name) {
                if (defined $action) {
                        $title .= "/$action";
                        if (defined $file_name) {


@@ -1801,7 +1824,7 @@ EOF
                      $cgi->hidden(-name => "a") . "\n" .
                      $cgi->hidden(-name => "h") . "\n" .
                      $cgi->popup_menu(-name => 'st', -default => 'commit',
                      $cgi->hidden(-name => "a") . "\n" .
                      $cgi->hidden(-name => "h") . "\n" .
                      $cgi->popup_menu(-name => 'st', -default => 'commit',

-                                      -values => ['commit', 'author', 'committer', 'pickaxe']) .
+                                      -values => ['commit', 'author', 'committer', 'pickaxe']) .

                      $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
                      " search:\n",
                      $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
                      $cgi->sup($cgi->a({-href => href(action=>"search_help")}, "?")) .
                      " search:\n",
                      $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .


@@ -1871,16 +1894,16 @@ sub git_print_page_nav {
        my %arg = map { $_ => {action=>$_} } @navs;
        if (defined $head) {
                for (qw(commit commitdiff)) {
        my %arg = map { $_ => {action=>$_} } @navs;
        if (defined $head) {
                for (qw(commit commitdiff)) {

-                       $arg{$_}{hash} = $head;
+                       $arg{$_}{'hash'} = $head;

                }
                if ($current =~ m/^(tree | log | shortlog | commit | commitdiff | search)$/x) {
                        for (qw(shortlog log)) {
                }
                if ($current =~ m/^(tree | log | shortlog | commit | commitdiff | search)$/x) {
                        for (qw(shortlog log)) {

-                               $arg{$_}{hash} = $head;
+                               $arg{$_}{'hash'} = $head;

                        }
                }
        }
                        }
                }
        }

-       $arg{tree}{hash} = $treehead if defined $treehead;
-       $arg{tree}{hash_base} = $treebase if defined $treebase;
+       $arg{'tree'}{'hash'} = $treehead if defined $treehead;
+       $arg{'tree'}{'hash_base'} = $treebase if defined $treebase;

 
        print "<div class=\"page_nav\">\n" .
                (join " | ",
 
        print "<div class=\"page_nav\">\n" .
                (join " | ",


@@ -1928,9 +1951,9 @@ sub git_print_header_div {
        my ($action, $title, $hash, $hash_base) = @_;
        my %args = ();
 
        my ($action, $title, $hash, $hash_base) = @_;
        my %args = ();
 

-       $args{action} = $action;
-       $args{hash} = $hash if $hash;
-       $args{hash_base} = $hash_base if $hash_base;
+       $args{'action'} = $action;
+       $args{'hash'} = $hash if $hash;
+       $args{'hash_base'} = $hash_base if $hash_base;

 
        print "<div class=\"header\">\n" .
              $cgi->a({-href => href(%args), -class => "title"},
 
        print "<div class=\"header\">\n" .
              $cgi->a({-href => href(%args), -class => "title"},


@@ -1964,7 +1987,7 @@ sub git_print_page_path {
 
        print "<div class=\"page_path\">";
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
 
        print "<div class=\"page_path\">";
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),

-                     -title => 'tree root'}, "[$project]");
+                     -title => 'tree root'}, to_utf8("[$project]"));

        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;
        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;


@@ -1975,17 +1998,17 @@ sub git_print_page_path {
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),

-                                     -title => esc_html($fullname)}, esc_path($dir));
+                                     -title => $fullname}, esc_path($dir));

                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),
                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),

-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));

                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),
                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),

-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));

                        print " / ";
                } else {
                        print esc_path($basename);
                        print " / ";
                } else {
                        print esc_path($basename);


@@ -2240,7 +2263,7 @@ sub git_difftree_body {
                        }
                        print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                     hash_base=>$hash, file_name=>$diff{'file'})},
                        }
                        print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                     hash_base=>$hash, file_name=>$diff{'file'})},

-                                     "blob") . " | ";
+                                     "blob");

                        print "</td>\n";
 
                } elsif ($diff{'status'} eq "D") { # deleted
                        print "</td>\n";
 
                } elsif ($diff{'status'} eq "D") { # deleted


@@ -2376,6 +2399,7 @@ sub git_patchset_body {
        my ($fd, $difftree, $hash, $hash_parent) = @_;
 
        my $patch_idx = 0;
        my ($fd, $difftree, $hash, $hash_parent) = @_;
 
        my $patch_idx = 0;

+       my $patch_number = 0;

        my $patch_line;
        my $diffinfo;
        my (%from, %to);
        my $patch_line;
        my $diffinfo;
        my (%from, %to);


@@ -2397,6 +2421,7 @@ sub git_patchset_body {
                # git diff header
                #assert($patch_line =~ m/^diff /) if DEBUG;
                #assert($patch_line !~ m!$/$!) if DEBUG; # is chomp-ed
                # git diff header
                #assert($patch_line =~ m/^diff /) if DEBUG;
                #assert($patch_line !~ m!$/$!) if DEBUG; # is chomp-ed

+               $patch_number++;

                push @diff_header, $patch_line;
 
                # extended diff header
                push @diff_header, $patch_line;
 
                # extended diff header


@@ -2413,7 +2438,6 @@ sub git_patchset_body {
 
                        push @diff_header, $patch_line;
                }
 
                        push @diff_header, $patch_line;
                }

-               #last PATCH unless $patch_line;

                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line
                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line


@@ -2523,7 +2547,10 @@ sub git_patchset_body {
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;

-               last PATCH unless $patch_line;
+               if (! $patch_line) {
+                       print "</div>\n"; # class="patch"
+                       last PATCH;
+               }

                next PATCH if ($patch_line =~ m/^diff /);
                #assert($patch_line =~ m/^---/) if DEBUG;
                if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
                next PATCH if ($patch_line =~ m/^diff /);
                #assert($patch_line =~ m/^---/) if DEBUG;
                if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {


@@ -2534,7 +2561,6 @@ sub git_patchset_body {
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;

-               #last PATCH unless $patch_line;

                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;
                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;


@@ -2558,6 +2584,7 @@ sub git_patchset_body {
        } continue {
                print "</div>\n"; # class="patch"
        }
        } continue {
                print "</div>\n"; # class="patch"
        }

+       print "<div class=\"diff nodifferences\">No differences found</div>\n" if (!$patch_number);

 
        print "</div>\n"; # class="patchset"
 }
 
        print "</div>\n"; # class="patchset"
 }


@@ -2598,7 +2625,7 @@ sub git_project_list_body {
                push @projects, $pr;
        }
 
                push @projects, $pr;
        }
 

-       $order ||= "project";
+       $order ||= $default_projects_order;

        $from = 0 unless defined $from;
        $to = $#projects if (!defined $to || $#projects < $to);
 
        $from = 0 unless defined $from;
        $to = $#projects if (!defined $to || $#projects < $to);
 


@@ -2957,7 +2984,7 @@ sub git_search_grep_body {
 
 sub git_project_list {
        my $order = $cgi->param('o');
 
 sub git_project_list {
        my $order = $cgi->param('o');

-       if (defined $order && $order !~ m/project|descr|owner|age/) {
+       if (defined $order && $order !~ m/none|project|descr|owner|age/) {

                die_error(undef, "Unknown order parameter");
        }
 
                die_error(undef, "Unknown order parameter");
        }
 


@@ -2980,7 +3007,7 @@ sub git_project_list {
 
 sub git_forks {
        my $order = $cgi->param('o');
 
 sub git_forks {
        my $order = $cgi->param('o');

-       if (defined $order && $order !~ m/project|descr|owner|age/) {
+       if (defined $order && $order !~ m/none|project|descr|owner|age/) {

                die_error(undef, "Unknown order parameter");
        }
 
                die_error(undef, "Unknown order parameter");
        }
 


@@ -3095,7 +3122,7 @@ sub git_summary {
                git_project_list_body(\@forklist, undef, 0, 15,
                                      $#forklist <= 15 ? undef :
                                      $cgi->a({-href => href(action=>"forks")}, "..."),
                git_project_list_body(\@forklist, undef, 0, 15,
                                      $#forklist <= 15 ? undef :
                                      $cgi->a({-href => href(action=>"forks")}, "..."),

-                                     'noheader');
+                                     'noheader');

        }
 
        git_footer_html();
        }
 
        git_footer_html();


@@ -3154,7 +3181,7 @@ sub git_blame2 {
        }
        $ftype = git_get_type($hash);
        if ($ftype !~ "blob") {
        }
        $ftype = git_get_type($hash);
        if ($ftype !~ "blob") {

-               die_error("400 Bad Request", "Object is not a blob");
+               die_error('400 Bad Request', "Object is not a blob");

        }
        open ($fd, "-|", git_cmd(), "blame", '-p', '--',
              $file_name, $hash_base)
        }
        open ($fd, "-|", git_cmd(), "blame", '-p', '--',
              $file_name, $hash_base)


@@ -3202,7 +3229,7 @@ HTML
                my $rev = substr($full_rev, 0, 8);
                my $author = $meta->{'author'};
                my %date = parse_date($meta->{'author-time'},
                my $rev = substr($full_rev, 0, 8);
                my $author = $meta->{'author'};
                my %date = parse_date($meta->{'author-time'},

-                                     $meta->{'author-tz'});
+                                     $meta->{'author-tz'});

                my $date = $date{'iso-tz'};
                if ($group_size) {
                        $current_color = ++$current_color % $num_colors;
                my $date = $date{'iso-tz'};
                if ($group_size) {
                        $current_color = ++$current_color % $num_colors;


@@ -3214,24 +3241,24 @@ HTML
                        print " rowspan=\"$group_size\"" if ($group_size > 1);
                        print ">";
                        print $cgi->a({-href => href(action=>"commit",
                        print " rowspan=\"$group_size\"" if ($group_size > 1);
                        print ">";
                        print $cgi->a({-href => href(action=>"commit",

-                                                    hash=>$full_rev,
-                                                    file_name=>$file_name)},
-                                     esc_html($rev));
+                                                    hash=>$full_rev,
+                                                    file_name=>$file_name)},
+                                     esc_html($rev));

                        print "</td>\n";
                }
                open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")
                        print "</td>\n";
                }
                open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")

-                       or die_error("could not open git-rev-parse");
+                       or die_error(undef, "Open git-rev-parse failed");

                my $parent_commit = <$dd>;
                close $dd;
                chomp($parent_commit);
                my $blamed = href(action => 'blame',
                my $parent_commit = <$dd>;
                close $dd;
                chomp($parent_commit);
                my $blamed = href(action => 'blame',

-                                 file_name => $meta->{'filename'},
-                                 hash_base => $parent_commit);
+                                 file_name => $meta->{'filename'},
+                                 hash_base => $parent_commit);

                print "<td class=\"linenr\">";
                print $cgi->a({ -href => "$blamed#l$orig_lineno",
                print "<td class=\"linenr\">";
                print $cgi->a({ -href => "$blamed#l$orig_lineno",

-                               -id => "l$lineno",
-                               -class => "linenr" },
-                             esc_html($lineno));
+                               -id => "l$lineno",
+                               -class => "linenr" },
+                             esc_html($lineno));

                print "</td>";
                print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                print "</tr>\n";
                print "</td>";
                print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                print "</tr>\n";


@@ -3610,7 +3637,7 @@ sub git_snapshot {
                $hash = git_get_head_hash($project);
        }
 
                $hash = git_get_head_hash($project);
        }
 

-       my $filename = basename($project) . "-$hash.tar.$suffix";
+       my $filename = to_utf8(basename($project)) . "-$hash.tar.$suffix";

 
        print $cgi->header(
                -type => "application/$ctype",
 
        print $cgi->header(
                -type => "application/$ctype",


@@ -3621,8 +3648,8 @@ sub git_snapshot {
        my $name = $project;
        $name =~ s/\047/\047\\\047\047/g;
        open my $fd, "-|",
        my $name = $project;
        $name =~ s/\047/\047\\\047\047/g;
        open my $fd, "-|",

-       "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
-               or die_error(undef, "Execute git-tar-tree failed.");
+               "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
+               or die_error(undef, "Execute git-tar-tree failed");

        binmode STDOUT, ':raw';
        print <$fd>;
        binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
        binmode STDOUT, ':raw';
        print <$fd>;
        binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi


@@ -3719,7 +3746,7 @@ sub git_commit {
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {

-                               $cgi->a({-href => href(action=>"commitdiff",
+                               $cgi->a({-href => href(action=>"commit",

                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .
                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .


@@ -3734,7 +3761,7 @@ sub git_commit {
                # difftree output is not printed for merges
                open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
                        @diff_opts, $parent, $hash, "--"
                # difftree output is not printed for merges
                open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
                        @diff_opts, $parent, $hash, "--"

-                               or die_error(undef, "Open git-diff-tree failed");
+                       or die_error(undef, "Open git-diff-tree failed");

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


@@ -3885,7 +3912,7 @@ sub git_blobdiff {
                        # read raw output
                        open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                                $hash_parent_base, $hash_base,
                        # read raw output
                        open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                                $hash_parent_base, $hash_base,

-                               "--", $file_name
+                               "--", (defined $file_parent ? $file_parent : ()), $file_name

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


@@ -3934,8 +3961,9 @@ sub git_blobdiff {
 
                # open patch output
                open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
 
                # open patch output
                open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,

-                       '-p', $hash_parent_base, $hash_base,
-                       "--", $file_name
+                       '-p', ($format eq 'html' ? "--full-index" : ()),
+                       $hash_parent_base, $hash_base,
+                       "--", (defined $file_parent ? $file_parent : ()), $file_name

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


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

-               open $fd, "-|", git_cmd(), "diff", '-p', @diff_opts,
+               open $fd, "-|", git_cmd(), "diff", @diff_opts,
+                       '-p', ($format eq 'html' ? "--full-index" : ()),

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


@@ -4304,13 +4333,13 @@ sub git_search {
                if ($page > 0) {
                        $paging_nav .=
                                $cgi->a({-href => href(action=>"search", hash=>$hash,
                if ($page > 0) {
                        $paging_nav .=
                                $cgi->a({-href => href(action=>"search", hash=>$hash,

-                                                      searchtext=>$searchtext, searchtype=>$searchtype)},
-                                       "first");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype)},
+                                       "first");

                        $paging_nav .= " &sdot; " .
                                $cgi->a({-href => href(action=>"search", hash=>$hash,
                        $paging_nav .= " &sdot; " .
                                $cgi->a({-href => href(action=>"search", hash=>$hash,

-                                                      searchtext=>$searchtext, searchtype=>$searchtype,
-                                                      page=>$page-1),
-                                        -accesskey => "p", -title => "Alt-p"}, "prev");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page-1),
+                                        -accesskey => "p", -title => "Alt-p"}, "prev");

                } else {
                        $paging_nav .= "first";
                        $paging_nav .= " &sdot; prev";
                } else {
                        $paging_nav .= "first";
                        $paging_nav .= " &sdot; prev";


@@ -4318,9 +4347,9 @@ sub git_search {
                if ($#commitlist >= 100) {
                        $paging_nav .= " &sdot; " .
                                $cgi->a({-href => href(action=>"search", hash=>$hash,
                if ($#commitlist >= 100) {
                        $paging_nav .= " &sdot; " .
                                $cgi->a({-href => href(action=>"search", hash=>$hash,

-                                                      searchtext=>$searchtext, searchtype=>$searchtype,
-                                                      page=>$page+1),
-                                        -accesskey => "n", -title => "Alt-n"}, "next");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page+1),
+                                        -accesskey => "n", -title => "Alt-n"}, "next");

                } else {
                        $paging_nav .= " &sdot; next";
                }
                } else {
                        $paging_nav .= " &sdot; next";
                }


@@ -4328,9 +4357,9 @@ sub git_search {
                if ($#commitlist >= 100) {
                        $next_link =
                                $cgi->a({-href => href(action=>"search", hash=>$hash,
                if ($#commitlist >= 100) {
                        $next_link =
                                $cgi->a({-href => href(action=>"search", hash=>$hash,

-                                                      searchtext=>$searchtext, searchtype=>$searchtype,
-                                                      page=>$page+1),
-                                        -accesskey => "n", -title => "Alt-n"}, "next");
+                                                      searchtext=>$searchtext, searchtype=>$searchtype,
+                                                      page=>$page+1),
+                                        -accesskey => "n", -title => "Alt-n"}, "next");

                }
 
                git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
                }
 
                git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);