gitweb: choose appropriate view for file type if a= parameter missing

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

index 852896a1e96495d96e81e1e2b7703d365e2a6d0ffa27678ebc5c3e1d546c0bf4..2298acf2421170eea8694f6159fb80efafd7629ca0b6b678c46744f14d88803d 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];
@@ -455,10 +459,16 @@ my %actions = (
         "project_index" => \&git_project_index,
  );
  
         "project_index" => \&git_project_index,
  );
  
-if (defined $project) {
-       $action ||= 'summary';
-} else {
-       $action ||= 'project_list';
+if (!defined $action) {
+       if (defined $hash) {
+               $action = git_get_type($hash);
+       } elsif (defined $hash_base && defined $file_name) {
+               $action = git_get_type("$hash_base:$file_name");
+       } elsif (defined $project) {
+               $action = 'summary';
+       } else {
+               $action = 'project_list';
+       }
  }
  if (!defined($actions{$action})) {
         die_error(undef, "Unknown action");
  }
  if (!defined($actions{$action})) {
         die_error(undef, "Unknown action");
@@ -561,12 +571,6 @@ sub validate_refname {
         return $input;
  }
  
         return $input;
  }
  
-# very thin wrapper for decode("utf8", $str, Encode::FB_DEFAULT);
-sub to_utf8 {
-       my $str = shift;
-       return decode("utf8", $str, Encode::FB_DEFAULT);
-}
-
  # quote unsafe chars, but keep the slash, even when it's not
  # correct, but quoted slashes look too horrible in bookmarks
  sub esc_param {
  # quote unsafe chars, but keep the slash, even when it's not
  # correct, but quoted slashes look too horrible in bookmarks
  sub esc_param {
@@ -591,8 +595,8 @@ sub esc_html ($;%) {
         my $str = shift;
         my %opts = @_;
  
         my $str = shift;
         my %opts = @_;
  
-       $str = to_utf8($str);
-       $str = escapeHTML($str);
+       $str = decode_utf8($str);
+       $str = $cgi->escapeHTML($str);
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
@@ -605,8 +609,8 @@ sub esc_path {
         my $str = shift;
         my %opts = @_;
  
         my $str = shift;
         my %opts = @_;
  
-       $str = to_utf8($str);
-       $str = escapeHTML($str);
+       $str = decode_utf8($str);
+       $str = $cgi->escapeHTML($str);
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/g;
         }
         if ($opts{'-nbsp'}) {
                 $str =~ s/ /&nbsp;/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 {
@@ -888,7 +892,7 @@ sub format_subject_html {
  
         if (length($short) < length($long)) {
                 return $cgi->a({-href => $href, -class => "list subject",
  
         if (length($short) < length($long)) {
                 return $cgi->a({-href => $href, -class => "list subject",
-                               -title => to_utf8($long)},
+                               -title => decode_utf8($long)},
                        esc_html($short) . $extra);
         } else {
                 return $cgi->a({-href => $href, -class => "list subject"},
                        esc_html($short) . $extra);
         } else {
                 return $cgi->a({-href => $href, -class => "list subject"},
@@ -900,19 +904,34 @@ sub format_subject_html {
  sub format_diff_line {
         my $line = shift;
         my ($from, $to) = @_;
  sub format_diff_line {
         my $line = shift;
         my ($from, $to) = @_;
-       my $char = substr($line, 0, 1);
         my $diff_class = "";
  
         chomp $line;
  
         my $diff_class = "";
  
         chomp $line;
  
-       if ($char eq '+') {
-               $diff_class = " add";
-       } elsif ($char eq "-") {
-               $diff_class = " rem";
-       } elsif ($char eq "@") {
-               $diff_class = " chunk_header";
-       } elsif ($char eq "\\") {
-               $diff_class = " incomplete";
+       if ($from && $to && ref($from->{'href'}) eq "ARRAY") {
+               # combined diff
+               my $prefix = substr($line, 0, scalar @{$from->{'href'}});
+               if ($line =~ m/^\@{3}/) {
+                       $diff_class = " chunk_header";
+               } elsif ($line =~ m/^\\/) {
+                       $diff_class = " incomplete";
+               } elsif ($prefix =~ tr/+/+/) {
+                       $diff_class = " add";
+               } elsif ($prefix =~ tr/-/-/) {
+                       $diff_class = " rem";
+               }
+       } else {
+               # assume ordinary diff
+               my $char = substr($line, 0, 1);
+               if ($char eq '+') {
+                       $diff_class = " add";
+               } elsif ($char eq '-') {
+                       $diff_class = " rem";
+               } elsif ($char eq '@') {
+                       $diff_class = " chunk_header";
+               } elsif ($char eq "\\") {
+                       $diff_class = " incomplete";
+               }
         }
         $line = untabify($line);
         if ($from && $to && $line =~ m/^\@{2} /) {
         }
         $line = untabify($line);
         if ($from && $to && $line =~ m/^\@{2} /) {
@@ -933,6 +952,39 @@ sub format_diff_line {
                 $line = "<span class=\"chunk_info\">@@ $from_text $to_text @@</span>" .
                         "<span class=\"section\">" . esc_html($section, -nbsp=>1) . "</span>";
                 return "<div class=\"diff$diff_class\">$line</div>\n";
                 $line = "<span class=\"chunk_info\">@@ $from_text $to_text @@</span>" .
                         "<span class=\"section\">" . esc_html($section, -nbsp=>1) . "</span>";
                 return "<div class=\"diff$diff_class\">$line</div>\n";
+       } elsif ($from && $to && $line =~ m/^\@{3}/) {
+               my ($prefix, $ranges, $section) = $line =~ m/^(\@+) (.*?) \@+(.*)$/;
+               my (@from_text, @from_start, @from_nlines, $to_text, $to_start, $to_nlines);
+
+               @from_text = split(' ', $ranges);
+               for (my $i = 0; $i < @from_text; ++$i) {
+                       ($from_start[$i], $from_nlines[$i]) =
+                               (split(',', substr($from_text[$i], 1)), 0);
+               }
+
+               $to_text   = pop @from_text;
+               $to_start  = pop @from_start;
+               $to_nlines = pop @from_nlines;
+
+               $line = "<span class=\"chunk_info\">$prefix ";
+               for (my $i = 0; $i < @from_text; ++$i) {
+                       if ($from->{'href'}[$i]) {
+                               $line .= $cgi->a({-href=>"$from->{'href'}[$i]#l$from_start[$i]",
+                                                 -class=>"list"}, $from_text[$i]);
+                       } else {
+                               $line .= $from_text[$i];
+                       }
+                       $line .= " ";
+               }
+               if ($to->{'href'}) {
+                       $line .= $cgi->a({-href=>"$to->{'href'}#l$to_start",
+                                         -class=>"list"}, $to_text);
+               } else {
+                       $line .= $to_text;
+               }
+               $line .= " $prefix</span>" .
+                        "<span class=\"section\">" . esc_html($section, -nbsp=>1) . "</span>";
+               return "<div class=\"diff$diff_class\">$line</div>\n";
         }
         return "<div class=\"diff$diff_class\">" . esc_html($line, -nbsp=>1) . "</div>\n";
  }
         }
         return "<div class=\"diff$diff_class\">" . esc_html($line, -nbsp=>1) . "</div>\n";
  }
@@ -987,7 +1039,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";
@@ -1018,6 +1070,30 @@ sub git_get_hash_by_path {
         return $3;
  }
  
         return $3;
  }
  
+# get path of entry with given hash at given tree-ish (ref)
+# used to get 'from' filename for combined diff (merge commit) for renames
+sub git_get_path_by_hash {
+       my $base = shift || return;
+       my $hash = shift || return;
+
+       local $/ = "\0";
+
+       open my $fd, "-|", git_cmd(), "ls-tree", '-r', '-t', '-z', $base
+               or return undef;
+       while (my $line = <$fd>) {
+               chomp $line;
+
+               #'040000 tree 595596a6a9117ddba9fe379b6b012b558bac8423  gitweb'
+               #'100644 blob e02e90f0429be0d2a69b76571101f20b8f75530f  gitweb/README'
+               if ($line =~ m/(?:[0-9]+) (?:.+) $hash\t(.+)$/) {
+                       close $fd;
+                       return $1;
+               }
+       }
+       close $fd;
+       return undef;
+}
+
  ## ......................................................................
  ## git utility functions, directly accessing git repository
  
  ## ......................................................................
  ## git utility functions, directly accessing git repository
  
@@ -1048,6 +1124,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 +1133,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 +1158,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,24 +1173,41 @@ 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")) {
                                 my $pr = {
                                         path => $path,
                                 }
                         }
                         if (check_export_ok("$projectroot/$path")) {
                                 my $pr = {
                                         path => $path,
-                                       owner => to_utf8($owner),
+                                       owner => decode_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;
  }
  
@@ -1134,7 +1229,7 @@ sub git_get_project_owner {
                         $pr = unescape($pr);
                         $ow = unescape($ow);
                         if ($pr eq $project) {
                         $pr = unescape($pr);
                         $ow = unescape($ow);
                         if ($pr eq $project) {
-                               $owner = to_utf8($ow);
+                               $owner = decode_utf8($ow);
                                 last;
                         }
                 }
                                 last;
                         }
                 }
@@ -1479,6 +1574,17 @@ sub parse_difftree_raw_line {
                         $res{'file'} = unquote($7);
                 }
         }
                         $res{'file'} = unquote($7);
                 }
         }
+       # '::100755 100755 100755 60e79ca1b01bc8b057abe17ddab484699a7f5fdb 94067cc5f73388f33722d52ae02f44692bc07490 94067cc5f73388f33722d52ae02f44692bc07490 MR git-gui/git-gui.sh'
+       # combined diff (for merge commit)
+       elsif ($line =~ s/^(::+)((?:[0-7]{6} )+)((?:[0-9a-fA-F]{40} )+)([a-zA-Z]+)\t(.*)$//) {
+               $res{'nparents'}  = length($1);
+               $res{'from_mode'} = [ split(' ', $2) ];
+               $res{'to_mode'} = pop @{$res{'from_mode'}};
+               $res{'from_id'} = [ split(' ', $3) ];
+               $res{'to_id'} = pop @{$res{'from_id'}};
+               $res{'status'} = [ split('', $4) ];
+               $res{'to_file'} = unquote($5);
+       }
         # 'c512b523472485aef4fff9e57b229d9d243c967f'
         elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
                 $res{'commit'} = $1;
         # 'c512b523472485aef4fff9e57b229d9d243c967f'
         elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
                 $res{'commit'} = $1;
@@ -1608,7 +1714,7 @@ sub get_file_owner {
         }
         my $owner = $gcos;
         $owner =~ s/[,;].*$//;
         }
         my $owner = $gcos;
         $owner =~ s/[,;].*$//;
-       return to_utf8($owner);
+       return decode_utf8($owner);
  }
  
  ## ......................................................................
  }
  
  ## ......................................................................
@@ -1691,7 +1797,7 @@ sub git_header_html {
  
         my $title = "$site_name";
         if (defined $project) {
  
         my $title = "$site_name";
         if (defined $project) {
-               $title .= " - $project";
+               $title .= " - " . decode_utf8($project);
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
                 if (defined $action) {
                         $title .= "/$action";
                         if (defined $file_name) {
@@ -1801,7 +1907,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 +1977,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 +2034,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 +2070,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'}, decode_utf8("[$project]"));
         print " / ";
         if (defined $name) {
                 my @dirname = split '/', $name;
         print " / ";
         if (defined $name) {
                 my @dirname = split '/', $name;
@@ -1975,17 +2081,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);
@@ -2182,8 +2288,42 @@ sub git_print_tree_entry {
  ## ......................................................................
  ## functions printing large fragments of HTML
  
  ## ......................................................................
  ## functions printing large fragments of HTML
  
+sub fill_from_file_info {
+       my ($diff, @parents) = @_;
+
+       $diff->{'from_file'} = [ ];
+       $diff->{'from_file'}[$diff->{'nparents'} - 1] = undef;
+       for (my $i = 0; $i < $diff->{'nparents'}; $i++) {
+               if ($diff->{'status'}[$i] eq 'R' ||
+                   $diff->{'status'}[$i] eq 'C') {
+                       $diff->{'from_file'}[$i] =
+                               git_get_path_by_hash($parents[$i], $diff->{'from_id'}[$i]);
+               }
+       }
+
+       return $diff;
+}
+
+# parameters can be strings, or references to arrays of strings
+sub from_ids_eq {
+       my ($a, $b) = @_;
+
+       if (ref($a) eq "ARRAY" && ref($b) eq "ARRAY" && @$a == @$b) {
+               for (my $i = 0; $i < @$a; ++$i) {
+                       return 0 unless ($a->[$i] eq $b->[$i]);
+               }
+               return 1;
+       } elsif (!ref($a) && !ref($b)) {
+               return $a eq $b;
+       } else {
+               return 0;
+       }
+}
+
+
  sub git_difftree_body {
  sub git_difftree_body {
-       my ($difftree, $hash, $parent) = @_;
+       my ($difftree, $hash, @parents) = @_;
+       my ($parent) = $parents[0];
         my ($have_blame) = gitweb_check_feature('blame');
         print "<div class=\"list_head\">\n";
         if ($#{$difftree} > 10) {
         my ($have_blame) = gitweb_check_feature('blame');
         print "<div class=\"list_head\">\n";
         if ($#{$difftree} > 10) {
@@ -2191,11 +2331,19 @@ sub git_difftree_body {
         }
         print "</div>\n";
  
         }
         print "</div>\n";
  
-       print "<table class=\"diff_tree\">\n";
+       print "<table class=\"" .
+             (@parents > 1 ? "combined " : "") .
+             "diff_tree\">\n";
         my $alternate = 1;
         my $patchno = 0;
         foreach my $line (@{$difftree}) {
         my $alternate = 1;
         my $patchno = 0;
         foreach my $line (@{$difftree}) {
-               my %diff = parse_difftree_raw_line($line);
+               my $diff;
+               if (ref($line) eq "HASH") {
+                       # pre-parsed (or generated by hand)
+                       $diff = $line;
+               } else {
+                       $diff = parse_difftree_raw_line($line);
+               }
  
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
  
                 if ($alternate) {
                         print "<tr class=\"dark\">\n";
@@ -2204,31 +2352,120 @@ sub git_difftree_body {
                 }
                 $alternate ^= 1;
  
                 }
                 $alternate ^= 1;
  
+               if (exists $diff->{'nparents'}) { # combined diff
+
+                       fill_from_file_info($diff, @parents)
+                               unless exists $diff->{'from_file'};
+
+                       if ($diff->{'to_id'} ne ('0' x 40)) {
+                               # file exists in the result (child) commit
+                               print "<td>" .
+                                     $cgi->a({-href => href(action=>"blob", hash=>$diff->{'to_id'},
+                                                            file_name=>$diff->{'to_file'},
+                                                            hash_base=>$hash),
+                                             -class => "list"}, esc_path($diff->{'to_file'})) .
+                                     "</td>\n";
+                       } else {
+                               print "<td>" .
+                                     esc_path($diff->{'to_file'}) .
+                                     "</td>\n";
+                       }
+
+                       if ($action eq 'commitdiff') {
+                               # link to patch
+                               $patchno++;
+                               print "<td class=\"link\">" .
+                                     $cgi->a({-href => "#patch$patchno"}, "patch") .
+                                     " | " .
+                                     "</td>\n";
+                       }
+
+                       my $has_history = 0;
+                       my $not_deleted = 0;
+                       for (my $i = 0; $i < $diff->{'nparents'}; $i++) {
+                               my $hash_parent = $parents[$i];
+                               my $from_hash = $diff->{'from_id'}[$i];
+                               my $from_path = $diff->{'from_file'}[$i];
+                               my $status = $diff->{'status'}[$i];
+
+                               $has_history ||= ($status ne 'A');
+                               $not_deleted ||= ($status ne 'D');
+
+                               if ($status eq 'A') {
+                                       print "<td  class=\"link\" align=\"right\"> | </td>\n";
+                               } elsif ($status eq 'D') {
+                                       print "<td class=\"link\">" .
+                                             $cgi->a({-href => href(action=>"blob",
+                                                                    hash_base=>$hash,
+                                                                    hash=>$from_hash,
+                                                                    file_name=>$from_path)},
+                                                     "blob" . ($i+1)) .
+                                             " | </td>\n";
+                               } else {
+                                       if ($diff->{'to_id'} eq $from_hash) {
+                                               print "<td class=\"link nochange\">";
+                                       } else {
+                                               print "<td class=\"link\">";
+                                       }
+                                       print $cgi->a({-href => href(action=>"blobdiff",
+                                                                    hash=>$diff->{'to_id'},
+                                                                    hash_parent=>$from_hash,
+                                                                    hash_base=>$hash,
+                                                                    hash_parent_base=>$hash_parent,
+                                                                    file_name=>$diff->{'to_file'},
+                                                                    file_parent=>$from_path)},
+                                                     "diff" . ($i+1)) .
+                                             " | </td>\n";
+                               }
+                       }
+
+                       print "<td class=\"link\">";
+                       if ($not_deleted) {
+                               print $cgi->a({-href => href(action=>"blob",
+                                                            hash=>$diff->{'to_id'},
+                                                            file_name=>$diff->{'to_file'},
+                                                            hash_base=>$hash)},
+                                             "blob");
+                               print " | " if ($has_history);
+                       }
+                       if ($has_history) {
+                               print $cgi->a({-href => href(action=>"history",
+                                                            file_name=>$diff->{'to_file'},
+                                                            hash_base=>$hash)},
+                                             "history");
+                       }
+                       print "</td>\n";
+
+                       print "</tr>\n";
+                       next; # instead of 'else' clause, to avoid extra indent
+               }
+               # else ordinary diff
+
                 my ($to_mode_oct, $to_mode_str, $to_file_type);
                 my ($from_mode_oct, $from_mode_str, $from_file_type);
                 my ($to_mode_oct, $to_mode_str, $to_file_type);
                 my ($from_mode_oct, $from_mode_str, $from_file_type);
-               if ($diff{'to_mode'} ne ('0' x 6)) {
-                       $to_mode_oct = oct $diff{'to_mode'};
+               if ($diff->{'to_mode'} ne ('0' x 6)) {
+                       $to_mode_oct = oct $diff->{'to_mode'};
                         if (S_ISREG($to_mode_oct)) { # only for regular file
                                 $to_mode_str = sprintf("%04o", $to_mode_oct & 0777); # permission bits
                         }
                         if (S_ISREG($to_mode_oct)) { # only for regular file
                                 $to_mode_str = sprintf("%04o", $to_mode_oct & 0777); # permission bits
                         }
-                       $to_file_type = file_type($diff{'to_mode'});
+                       $to_file_type = file_type($diff->{'to_mode'});
                 }
                 }
-               if ($diff{'from_mode'} ne ('0' x 6)) {
-                       $from_mode_oct = oct $diff{'from_mode'};
+               if ($diff->{'from_mode'} ne ('0' x 6)) {
+                       $from_mode_oct = oct $diff->{'from_mode'};
                         if (S_ISREG($to_mode_oct)) { # only for regular file
                                 $from_mode_str = sprintf("%04o", $from_mode_oct & 0777); # permission bits
                         }
                         if (S_ISREG($to_mode_oct)) { # only for regular file
                                 $from_mode_str = sprintf("%04o", $from_mode_oct & 0777); # permission bits
                         }
-                       $from_file_type = file_type($diff{'from_mode'});
+                       $from_file_type = file_type($diff->{'from_mode'});
                 }
  
                 }
  
-               if ($diff{'status'} eq "A") { # created
+               if ($diff->{'status'} eq "A") { # created
                         my $mode_chng = "<span class=\"file_status new\">[new $to_file_type";
                         $mode_chng   .= " with mode: $to_mode_str" if $to_mode_str;
                         $mode_chng   .= "]</span>";
                         print "<td>";
                         my $mode_chng = "<span class=\"file_status new\">[new $to_file_type";
                         $mode_chng   .= " with mode: $to_mode_str" if $to_mode_str;
                         $mode_chng   .= "]</span>";
                         print "<td>";
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'}),
-                                     -class => "list"}, esc_path($diff{'file'}));
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff->{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff->{'file'}),
+                                     -class => "list"}, esc_path($diff->{'file'}));
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
@@ -2238,17 +2475,17 @@ sub git_difftree_body {
                                 print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 print " | ";
                         }
                                 print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 print " | ";
                         }
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'})},
-                                     "blob") . " | ";
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff->{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff->{'file'})},
+                                     "blob");
                         print "</td>\n";
  
                         print "</td>\n";
  
-               } elsif ($diff{'status'} eq "D") { # deleted
+               } elsif ($diff->{'status'} eq "D") { # deleted
                         my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
                         print "<td>";
                         my $mode_chng = "<span class=\"file_status deleted\">[deleted $from_file_type]</span>";
                         print "<td>";
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
-                                                    hash_base=>$parent, file_name=>$diff{'file'}),
-                                      -class => "list"}, esc_path($diff{'file'}));
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff->{'from_id'},
+                                                    hash_base=>$parent, file_name=>$diff->{'file'}),
+                                      -class => "list"}, esc_path($diff->{'file'}));
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
                         print "</td>\n";
                         print "<td>$mode_chng</td>\n";
                         print "<td class=\"link\">";
@@ -2258,22 +2495,22 @@ sub git_difftree_body {
                                 print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 print " | ";
                         }
                                 print $cgi->a({-href => "#patch$patchno"}, "patch");
                                 print " | ";
                         }
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'from_id'},
-                                                    hash_base=>$parent, file_name=>$diff{'file'})},
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff->{'from_id'},
+                                                    hash_base=>$parent, file_name=>$diff->{'file'})},
                                       "blob") . " | ";
                         if ($have_blame) {
                                 print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
                                       "blob") . " | ";
                         if ($have_blame) {
                                 print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
-                                                            file_name=>$diff{'file'})},
+                                                            file_name=>$diff->{'file'})},
                                               "blame") . " | ";
                         }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
                                               "blame") . " | ";
                         }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
-                                                    file_name=>$diff{'file'})},
+                                                    file_name=>$diff->{'file'})},
                                       "history");
                         print "</td>\n";
  
                                       "history");
                         print "</td>\n";
  
-               } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
+               } elsif ($diff->{'status'} eq "M" || $diff->{'status'} eq "T") { # modified, or type changed
                         my $mode_chnge = "";
                         my $mode_chnge = "";
-                       if ($diff{'from_mode'} != $diff{'to_mode'}) {
+                       if ($diff->{'from_mode'} != $diff->{'to_mode'}) {
                                 $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
                                 if ($from_file_type ne $to_file_type) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
                                 $mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
                                 if ($from_file_type ne $to_file_type) {
                                         $mode_chnge .= " from $from_file_type to $to_file_type";
@@ -2288,9 +2525,9 @@ sub git_difftree_body {
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
                                 $mode_chnge .= "]</span>\n";
                         }
                         print "<td>";
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$hash, file_name=>$diff{'file'}),
-                                     -class => "list"}, esc_path($diff{'file'}));
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff->{'to_id'},
+                                                    hash_base=>$hash, file_name=>$diff->{'file'}),
+                                     -class => "list"}, esc_path($diff->{'file'}));
                         print "</td>\n";
                         print "<td>$mode_chnge</td>\n";
                         print "<td class=\"link\">";
                         print "</td>\n";
                         print "<td>$mode_chnge</td>\n";
                         print "<td class=\"link\">";
@@ -2299,70 +2536,70 @@ sub git_difftree_body {
                                 $patchno++;
                                 print $cgi->a({-href => "#patch$patchno"}, "patch") .
                                       " | ";
                                 $patchno++;
                                 print $cgi->a({-href => "#patch$patchno"}, "patch") .
                                       " | ";
-                       } elsif ($diff{'to_id'} ne $diff{'from_id'}) {
+                       } elsif ($diff->{'to_id'} ne $diff->{'from_id'}) {
                                 # "commit" view and modified file (not onlu mode changed)
                                 print $cgi->a({-href => href(action=>"blobdiff",
                                 # "commit" view and modified file (not onlu mode changed)
                                 print $cgi->a({-href => href(action=>"blobdiff",
-                                                            hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                            hash=>$diff->{'to_id'}, hash_parent=>$diff->{'from_id'},
                                                              hash_base=>$hash, hash_parent_base=>$parent,
                                                              hash_base=>$hash, hash_parent_base=>$parent,
-                                                            file_name=>$diff{'file'})},
+                                                            file_name=>$diff->{'file'})},
                                               "diff") .
                                       " | ";
                         }
                                               "diff") .
                                       " | ";
                         }
-                       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") . " | ";
                         if ($have_blame) {
                                 print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
                                        "blob") . " | ";
                         if ($have_blame) {
                                 print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
-                                                            file_name=>$diff{'file'})},
+                                                            file_name=>$diff->{'file'})},
                                               "blame") . " | ";
                         }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
                                               "blame") . " | ";
                         }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
-                                                    file_name=>$diff{'file'})},
+                                                    file_name=>$diff->{'file'})},
                                       "history");
                         print "</td>\n";
  
                                       "history");
                         print "</td>\n";
  
-               } elsif ($diff{'status'} eq "R" || $diff{'status'} eq "C") { # renamed or copied
+               } elsif ($diff->{'status'} eq "R" || $diff->{'status'} eq "C") { # renamed or copied
                         my %status_name = ('R' => 'moved', 'C' => 'copied');
                         my %status_name = ('R' => 'moved', 'C' => 'copied');
-                       my $nstatus = $status_name{$diff{'status'}};
+                       my $nstatus = $status_name{$diff->{'status'}};
                         my $mode_chng = "";
                         my $mode_chng = "";
-                       if ($diff{'from_mode'} != $diff{'to_mode'}) {
+                       if ($diff->{'from_mode'} != $diff->{'to_mode'}) {
                                 # mode also for directories, so we cannot use $to_mode_str
                                 $mode_chng = sprintf(", mode: %04o", $to_mode_oct & 0777);
                         }
                         print "<td>" .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
                                 # mode also for directories, so we cannot use $to_mode_str
                                 $mode_chng = sprintf(", mode: %04o", $to_mode_oct & 0777);
                         }
                         print "<td>" .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$hash,
-                                                    hash=>$diff{'to_id'}, file_name=>$diff{'to_file'}),
-                                     -class => "list"}, esc_path($diff{'to_file'})) . "</td>\n" .
+                                                    hash=>$diff->{'to_id'}, file_name=>$diff->{'to_file'}),
+                                     -class => "list"}, esc_path($diff->{'to_file'})) . "</td>\n" .
                               "<td><span class=\"file_status $nstatus\">[$nstatus from " .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$parent,
                               "<td><span class=\"file_status $nstatus\">[$nstatus from " .
                               $cgi->a({-href => href(action=>"blob", hash_base=>$parent,
-                                                    hash=>$diff{'from_id'}, file_name=>$diff{'from_file'}),
-                                     -class => "list"}, esc_path($diff{'from_file'})) .
-                             " with " . (int $diff{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
+                                                    hash=>$diff->{'from_id'}, file_name=>$diff->{'from_file'}),
+                                     -class => "list"}, esc_path($diff->{'from_file'})) .
+                             " with " . (int $diff->{'similarity'}) . "% similarity$mode_chng]</span></td>\n" .
                               "<td class=\"link\">";
                         if ($action eq 'commitdiff') {
                                 # link to patch
                                 $patchno++;
                                 print $cgi->a({-href => "#patch$patchno"}, "patch") .
                                       " | ";
                               "<td class=\"link\">";
                         if ($action eq 'commitdiff') {
                                 # link to patch
                                 $patchno++;
                                 print $cgi->a({-href => "#patch$patchno"}, "patch") .
                                       " | ";
-                       } elsif ($diff{'to_id'} ne $diff{'from_id'}) {
+                       } elsif ($diff->{'to_id'} ne $diff->{'from_id'}) {
                                 # "commit" view and modified file (not only pure rename or copy)
                                 print $cgi->a({-href => href(action=>"blobdiff",
                                 # "commit" view and modified file (not only pure rename or copy)
                                 print $cgi->a({-href => href(action=>"blobdiff",
-                                                            hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                            hash=>$diff->{'to_id'}, hash_parent=>$diff->{'from_id'},
                                                              hash_base=>$hash, hash_parent_base=>$parent,
                                                              hash_base=>$hash, hash_parent_base=>$parent,
-                                                            file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
+                                                            file_name=>$diff->{'to_file'}, file_parent=>$diff->{'from_file'})},
                                               "diff") .
                                       " | ";
                         }
                                               "diff") .
                                       " | ";
                         }
-                       print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
-                                                    hash_base=>$parent, file_name=>$diff{'to_file'})},
+                       print $cgi->a({-href => href(action=>"blob", hash=>$diff->{'to_id'},
+                                                    hash_base=>$parent, file_name=>$diff->{'to_file'})},
                                       "blob") . " | ";
                         if ($have_blame) {
                                 print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
                                       "blob") . " | ";
                         if ($have_blame) {
                                 print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
-                                                            file_name=>$diff{'to_file'})},
+                                                            file_name=>$diff->{'to_file'})},
                                               "blame") . " | ";
                         }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
                                               "blame") . " | ";
                         }
                         print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
-                                                   file_name=>$diff{'to_file'})},
+                                                   file_name=>$diff->{'to_file'})},
                                       "history");
                         print "</td>\n";
  
                                       "history");
                         print "</td>\n";
  
@@ -2373,13 +2610,14 @@ sub git_difftree_body {
  }
  
  sub git_patchset_body {
  }
  
  sub git_patchset_body {
-       my ($fd, $difftree, $hash, $hash_parent) = @_;
+       my ($fd, $difftree, $hash, @hash_parents) = @_;
+       my ($hash_parent) = $hash_parents[0];
  
         my $patch_idx = 0;
  
         my $patch_idx = 0;
+       my $patch_number = 0;
         my $patch_line;
         my $diffinfo;
         my (%from, %to);
         my $patch_line;
         my $diffinfo;
         my (%from, %to);
-       my ($from_id, $to_id);
  
         print "<div class=\"patchset\">\n";
  
  
         print "<div class=\"patchset\">\n";
  
@@ -2393,10 +2631,12 @@ sub git_patchset_body {
   PATCH:
         while ($patch_line) {
                 my @diff_header;
   PATCH:
         while ($patch_line) {
                 my @diff_header;
+               my ($from_id, $to_id);
  
                 # git diff header
                 #assert($patch_line =~ m/^diff /) if DEBUG;
                 #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
@@ -2404,23 +2644,25 @@ sub git_patchset_body {
                 while ($patch_line = <$fd>) {
                         chomp $patch_line;
  
                 while ($patch_line = <$fd>) {
                         chomp $patch_line;
  
-                       last EXTENDED_HEADER if ($patch_line =~ m/^--- /);
+                       last EXTENDED_HEADER if ($patch_line =~ m/^--- |^diff /);
  
                         if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
                                 $from_id = $1;
                                 $to_id   = $2;
  
                         if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
                                 $from_id = $1;
                                 $to_id   = $2;
+                       } elsif ($patch_line =~ m/^index ((?:[0-9a-fA-F]{40},)+[0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
+                               $from_id = [ split(',', $1) ];
+                               $to_id   = $2;
                         }
  
                         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
                 # and parse raw git-diff line if needed
                 if (defined $diffinfo &&
                 my $last_patch_line = $patch_line;
  
                 # check if current patch belong to current raw line
                 # and parse raw git-diff line if needed
                 if (defined $diffinfo &&
-                   $diffinfo->{'from_id'} eq $from_id &&
-                   $diffinfo->{'to_id'}   eq $to_id) {
+                   from_ids_eq($diffinfo->{'from_id'}, $from_id) &&
+                   $diffinfo->{'to_id'} eq $to_id) {
                         # this is split patch
                         print "<div class=\"patch cont\">\n";
                 } else {
                         # this is split patch
                         print "<div class=\"patch cont\">\n";
                 } else {
@@ -2434,17 +2676,40 @@ sub git_patchset_body {
                         } else {
                                 $diffinfo = parse_difftree_raw_line($difftree->[$patch_idx]);
                         }
                         } else {
                                 $diffinfo = parse_difftree_raw_line($difftree->[$patch_idx]);
                         }
-                       $from{'file'} = $diffinfo->{'from_file'} || $diffinfo->{'file'};
-                       $to{'file'}   = $diffinfo->{'to_file'}   || $diffinfo->{'file'};
-                       if ($diffinfo->{'status'} ne "A") { # not new (added) file
-                               $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
-                                                    hash=>$diffinfo->{'from_id'},
-                                                    file_name=>$from{'file'});
+                       if ($diffinfo->{'nparents'}) {
+                               # combined diff
+                               $from{'file'} = [];
+                               $from{'href'} = [];
+                               fill_from_file_info($diffinfo, @hash_parents)
+                                       unless exists $diffinfo->{'from_file'};
+                               for (my $i = 0; $i < $diffinfo->{'nparents'}; $i++) {
+                                       $from{'file'}[$i] = $diffinfo->{'from_file'}[$i] || $diffinfo->{'to_file'};
+                                       if ($diffinfo->{'status'}[$i] ne "A") { # not new (added) file
+                                               $from{'href'}[$i] = href(action=>"blob",
+                                                                        hash_base=>$hash_parents[$i],
+                                                                        hash=>$diffinfo->{'from_id'}[$i],
+                                                                        file_name=>$from{'file'}[$i]);
+                                       } else {
+                                               $from{'href'}[$i] = undef;
+                                       }
+                               }
+                       } else {
+                               $from{'file'} = $diffinfo->{'from_file'} || $diffinfo->{'file'};
+                               if ($diffinfo->{'status'} ne "A") { # not new (added) file
+                                       $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
+                                                            hash=>$diffinfo->{'from_id'},
+                                                            file_name=>$from{'file'});
+                               } else {
+                                       delete $from{'href'};
+                               }
                         }
                         }
+                       $to{'file'} = $diffinfo->{'to_file'} || $diffinfo->{'file'};
                         if ($diffinfo->{'status'} ne "D") { # not deleted file
                                 $to{'href'} = href(action=>"blob", hash_base=>$hash,
                                                    hash=>$diffinfo->{'to_id'},
                                                    file_name=>$to{'file'});
                         if ($diffinfo->{'status'} ne "D") { # not deleted file
                                 $to{'href'} = href(action=>"blob", hash_base=>$hash,
                                                    hash=>$diffinfo->{'to_id'},
                                                    file_name=>$to{'file'});
+                       } else {
+                               delete $to{'href'};
                         }
                         # this is first patch for raw difftree line with $patch_idx index
                         # we index @$difftree array from 0, but number patches from 1
                         }
                         # this is first patch for raw difftree line with $patch_idx index
                         # we index @$difftree array from 0, but number patches from 1
@@ -2453,19 +2718,34 @@ sub git_patchset_body {
  
                 # print "git diff" header
                 $patch_line = shift @diff_header;
  
                 # print "git diff" header
                 $patch_line = shift @diff_header;
-               $patch_line =~ s!^(diff (.*?) )"?a/.*$!$1!;
-               if ($from{'href'}) {
-                       $patch_line .= $cgi->a({-href => $from{'href'}, -class => "path"},
-                                              'a/' . esc_path($from{'file'}));
-               } else { # file was added
-                       $patch_line .= 'a/' . esc_path($from{'file'});
-               }
-               $patch_line .= ' ';
-               if ($to{'href'}) {
-                       $patch_line .= $cgi->a({-href => $to{'href'}, -class => "path"},
-                                              'b/' . esc_path($to{'file'}));
-               } else { # file was deleted
-                       $patch_line .= 'b/' . esc_path($to{'file'});
+               if ($diffinfo->{'nparents'}) {
+
+                       # combined diff
+                       $patch_line =~ s!^(diff (.*?) )"?.*$!$1!;
+                       if ($to{'href'}) {
+                               $patch_line .= $cgi->a({-href => $to{'href'}, -class => "path"},
+                                                      esc_path($to{'file'}));
+                       } else { # file was deleted
+                               $patch_line .= esc_path($to{'file'});
+                       }
+
+               } else {
+
+                       $patch_line =~ s!^(diff (.*?) )"?a/.*$!$1!;
+                       if ($from{'href'}) {
+                               $patch_line .= $cgi->a({-href => $from{'href'}, -class => "path"},
+                                                      'a/' . esc_path($from{'file'}));
+                       } else { # file was added
+                               $patch_line .= 'a/' . esc_path($from{'file'});
+                       }
+                       $patch_line .= ' ';
+                       if ($to{'href'}) {
+                               $patch_line .= $cgi->a({-href => $to{'href'}, -class => "path"},
+                                                      'b/' . esc_path($to{'file'}));
+                       } else { # file was deleted
+                               $patch_line .= 'b/' . esc_path($to{'file'});
+                       }
+
                 }
                 print "<div class=\"diff header\">$patch_line</div>\n";
  
                 }
                 print "<div class=\"diff header\">$patch_line</div>\n";
  
@@ -2476,20 +2756,43 @@ sub git_patchset_body {
                         # match <path>
                         if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                 $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
                         # match <path>
                         if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                 $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
-                                                       esc_path($from{'file'}));
+                                                      esc_path($from{'file'}));
                         }
                         if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
                         }
                         if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
-                               $patch_line = $cgi->a({-href=>$to{'href'}, -class=>"path"},
-                                                     esc_path($to{'file'}));
+                               $patch_line .= $cgi->a({-href=>$to{'href'}, -class=>"path"},
+                                                      esc_path($to{'file'}));
                         }
                         }
-                       # match <mode>
+                       # match single <mode>
                         if ($patch_line =~ m/\s(\d{6})$/) {
                                 $patch_line .= '<span class="info"> (' .
                                                file_type_long($1) .
                                                ')</span>';
                         }
                         # match <hash>
                         if ($patch_line =~ m/\s(\d{6})$/) {
                                 $patch_line .= '<span class="info"> (' .
                                                file_type_long($1) .
                                                ')</span>';
                         }
                         # match <hash>
-                       if ($patch_line =~ m/^index/) {
+                       if ($patch_line =~ m/^index [0-9a-fA-F]{40},[0-9a-fA-F]{40}/) {
+                               # can match only for combined diff
+                               $patch_line = 'index ';
+                               for (my $i = 0; $i < $diffinfo->{'nparents'}; $i++) {
+                                       if ($from{'href'}[$i]) {
+                                               $patch_line .= $cgi->a({-href=>$from{'href'}[$i],
+                                                                       -class=>"hash"},
+                                                                      substr($diffinfo->{'from_id'}[$i],0,7));
+                                       } else {
+                                               $patch_line .= '0' x 7;
+                                       }
+                                       # separator
+                                       $patch_line .= ',' if ($i < $diffinfo->{'nparents'} - 1);
+                               }
+                               $patch_line .= '..';
+                               if ($to{'href'}) {
+                                       $patch_line .= $cgi->a({-href=>$to{'href'}, -class=>"hash"},
+                                                              substr($diffinfo->{'to_id'},0,7));
+                               } else {
+                                       $patch_line .= '0' x 7;
+                               }
+
+                       } elsif ($patch_line =~ m/^index [0-9a-fA-F]{40}..[0-9a-fA-F]{40}/) {
+                               # can match only for ordinary diff
                                 my ($from_link, $to_link);
                                 if ($from{'href'}) {
                                         $from_link = $cgi->a({-href=>$from{'href'}, -class=>"hash"},
                                 my ($from_link, $to_link);
                                 if ($from{'href'}) {
                                         $from_link = $cgi->a({-href=>$from{'href'}, -class=>"hash"},
@@ -2519,8 +2822,14 @@ sub git_patchset_body {
  
                 # from-file/to-file diff header
                 $patch_line = $last_patch_line;
  
                 # from-file/to-file diff header
                 $patch_line = $last_patch_line;
+               if (! $patch_line) {
+                       print "</div>\n"; # class="patch"
+                       last PATCH;
+               }
+               next PATCH if ($patch_line =~ m/^diff /);
                 #assert($patch_line =~ m/^---/) if DEBUG;
                 #assert($patch_line =~ m/^---/) if DEBUG;
-               if ($from{'href'}) {
+               if (!$diffinfo->{'nparents'} && # not from-file line for combined diff
+                   $from{'href'} && $patch_line =~ m!^--- "?a/!) {
                         $patch_line = '--- a/' .
                                       $cgi->a({-href=>$from{'href'}, -class=>"path"},
                                               esc_path($from{'file'}));
                         $patch_line = '--- a/' .
                                       $cgi->a({-href=>$from{'href'}, -class=>"path"},
                                               esc_path($from{'file'}));
@@ -2528,11 +2837,10 @@ sub git_patchset_body {
                 print "<div class=\"diff from_file\">$patch_line</div>\n";
  
                 $patch_line = <$fd>;
                 print "<div class=\"diff from_file\">$patch_line</div>\n";
  
                 $patch_line = <$fd>;
-               last PATCH unless $patch_line;
                 chomp $patch_line;
  
                 #assert($patch_line =~ m/^+++/) if DEBUG;
                 chomp $patch_line;
  
                 #assert($patch_line =~ m/^+++/) if DEBUG;
-               if ($to{'href'}) {
+               if ($to{'href'} && $patch_line =~ m!^\+\+\+ "?b/!) {
                         $patch_line = '+++ b/' .
                                       $cgi->a({-href=>$to{'href'}, -class=>"path"},
                                               esc_path($to{'file'}));
                         $patch_line = '+++ b/' .
                                       $cgi->a({-href=>$to{'href'}, -class=>"path"},
                                               esc_path($to{'file'}));
@@ -2552,6 +2860,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"
  }
@@ -2572,7 +2881,7 @@ sub git_project_list_body {
                 ($pr->{'age'}, $pr->{'age_string'}) = @aa;
                 if (!defined $pr->{'descr'}) {
                         my $descr = git_get_project_description($pr->{'path'}) || "";
                 ($pr->{'age'}, $pr->{'age_string'}) = @aa;
                 if (!defined $pr->{'descr'}) {
                         my $descr = git_get_project_description($pr->{'path'}) || "";
-                       $pr->{'descr_long'} = to_utf8($descr);
+                       $pr->{'descr_long'} = decode_utf8($descr);
                         $pr->{'descr'} = chop_str($descr, 25, 5);
                 }
                 if (!defined $pr->{'owner'}) {
                         $pr->{'descr'} = chop_str($descr, 25, 5);
                 }
                 if (!defined $pr->{'owner'}) {
@@ -2592,7 +2901,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);
  
@@ -2951,7 +3260,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");
         }
  
@@ -2974,7 +3283,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");
         }
  
@@ -3089,7 +3398,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();
@@ -3148,7 +3457,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)
@@ -3196,7 +3505,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;
@@ -3208,24 +3517,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";
@@ -3604,7 +3913,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 = decode_utf8(basename($project)) . "-$hash.tar.$suffix";
  
         print $cgi->header(
                 -type => "application/$ctype",
  
         print $cgi->header(
                 -type => "application/$ctype",
@@ -3615,8 +3924,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
@@ -3713,7 +4022,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 ) .
@@ -3724,14 +4033,13 @@ sub git_commit {
                 $parent = "--root";
         }
         my @difftree;
                 $parent = "--root";
         }
         my @difftree;
-       if (@$parents <= 1) {
-               # 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");
-               @difftree = map { chomp; $_ } <$fd>;
-               close $fd or die_error(undef, "Reading git-diff-tree failed");
-       }
+       open my $fd, "-|", git_cmd(), "diff-tree", '-r', "--no-commit-id",
+               @diff_opts,
+               (@$parents <= 1 ? $parent : '-c'),
+               $hash, "--"
+               or die_error(undef, "Open git-diff-tree failed");
+       @difftree = map { chomp; $_ } <$fd>;
+       close $fd or die_error(undef, "Reading git-diff-tree failed");
  
         # non-textual hash id's can be cached
         my $expires;
  
         # non-textual hash id's can be cached
         my $expires;
@@ -3809,10 +4117,7 @@ sub git_commit {
         git_print_log($co{'comment'});
         print "</div>\n";
  
         git_print_log($co{'comment'});
         print "</div>\n";
  
-       if (@$parents <= 1) {
-               # do not output difftree/whatchanged for merges
-               git_difftree_body(\@difftree, $hash, $parent);
-       }
+       git_difftree_body(\@difftree, $hash, @$parents);
  
         git_footer_html();
  }
  
         git_footer_html();
  }
@@ -3879,7 +4184,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
@@ -3928,8 +4233,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");
         }
  
@@ -3963,7 +4269,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  {
@@ -4087,8 +4394,10 @@ sub git_commitdiff {
                 }
         }
  
                 }
         }
  
+       my $hash_parent_param = $hash_parent;
         if (!defined $hash_parent) {
         if (!defined $hash_parent) {
-               $hash_parent = $co{'parent'} || '--root';
+               $hash_parent_param =
+                       @{$co{'parents'}} > 1 ? '-c' : $co{'parent'} || '--root';
         }
  
         # read commitdiff
         }
  
         # read commitdiff
@@ -4097,19 +4406,19 @@ sub git_commitdiff {
         if ($format eq 'html') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                         "--no-commit-id", "--patch-with-raw", "--full-index",
         if ($format eq 'html') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                         "--no-commit-id", "--patch-with-raw", "--full-index",
-                       $hash_parent, $hash, "--"
+                       $hash_parent_param, $hash, "--"
                         or die_error(undef, "Open git-diff-tree failed");
  
                 while (my $line = <$fd>) {
                         chomp $line;
                         # empty line ends raw part of diff-tree output
                         last unless $line;
                         or die_error(undef, "Open git-diff-tree failed");
  
                 while (my $line = <$fd>) {
                         chomp $line;
                         # empty line ends raw part of diff-tree output
                         last unless $line;
-                       push @difftree, $line;
+                       push @difftree, scalar parse_difftree_raw_line($line);
                 }
  
         } elsif ($format eq 'plain') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
                 }
  
         } elsif ($format eq 'plain') {
                 open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-                       '-p', $hash_parent, $hash, "--"
+                       '-p', $hash_parent_param, $hash, "--"
                         or die_error(undef, "Open git-diff-tree failed");
  
         } else {
                         or die_error(undef, "Open git-diff-tree failed");
  
         } else {
@@ -4165,10 +4474,10 @@ TEXT
  
         # write patch
         if ($format eq 'html') {
  
         # write patch
         if ($format eq 'html') {
-               git_difftree_body(\@difftree, $hash, $hash_parent);
+               git_difftree_body(\@difftree, $hash, $hash_parent || @{$co{'parents'}});
                 print "<br/>\n";
  
                 print "<br/>\n";
  
-               git_patchset_body($fd, \@difftree, $hash, $hash_parent);
+               git_patchset_body($fd, \@difftree, $hash, $hash_parent || @{$co{'parents'}});
                 close $fd;
                 print "</div>\n"; # class="page_body"
                 git_footer_html();
                 close $fd;
                 print "</div>\n"; # class="page_body"
                 git_footer_html();
@@ -4298,13 +4607,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";
@@ -4312,9 +4621,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";
                 }
@@ -4322,9 +4631,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);