Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7c136ec0d3bc9658aabd5f02b04d18f076eba8c1..5c7011a37b2e4dab8c38de54a3e531d2fa16ddbe 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -408,13 +408,6 @@ sub check_export_ok {
        $search_regexp = quotemeta $searchtext;
 }
 
-our $searchtype = $cgi->param('st');
-if (defined $searchtype) {
-       if ($searchtype =~ m/[^a-z]/) {
-               die_error(undef, "Invalid searchtype parameter");
-       }
-}
-
 # now read PATH_INFO and use it as alternative to parameters
 sub evaluate_path_info {
        return if defined $project;
@@ -5047,7 +5040,8 @@ sub git_feed {
 
                # get list of changed files
                open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,
-                       $co{'parent'}, $co{'id'}, "--", (defined $file_name ? $file_name : ())
+                       $co{'parent'} || "--root",
+                       $co{'id'}, "--", (defined $file_name ? $file_name : ())
                        or next;
                my @difftree = map { chomp; $_ } <$fd>;
                close $fd