gitweb: minimally fix "fork" support.

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index c2c296ebb2d8d8d9966d65395d30409c7b51dd8198ffdccd73df8e60a358e185..315eb117a8890cfdbb72594aae74b4506797a54567bab7b0d2180bf731472ddd 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -923,9 +923,11 @@ sub git_get_projects_list {
        if (-d $projects_list) {
                # search in directory
                my $dir = $projects_list . ($filter ? "/$filter" : '');
+               # remove the trailing "/"
+               $dir =~ s!/+$!!;
                my $pfxlen = length("$dir");
 
-               my $check_forks = gitweb_check_feature('forks');
+               my ($check_forks) = gitweb_check_feature('forks');
 
                File::Find::find({
                        follow_fast => 1, # follow symbolic links
@@ -961,6 +963,17 @@ sub git_get_projects_list {
                        if (!defined $path) {
                                next;
                        }
+                       if ($filter ne '') {
+                               # looking for forks;
+                               my $pfx = substr($path, 0, length($filter));
+                               if ($pfx ne $filter) {
+                                       next;
+                               }
+                               my $sfx = substr($path, length($filter));
+                               if ($sfx !~ /^\/.*\.git$/) {
+                                       next;
+                               }
+                       }
                        if (check_export_ok("$projectroot/$path")) {
                                my $pr = {
                                        path => $path,
@@ -2211,7 +2224,7 @@ sub git_patchset_body {
 sub git_project_list_body {
        my ($projlist, $order, $from, $to, $extra, $no_header) = @_;
 
-       my $check_forks = gitweb_check_feature('forks');
+       my ($check_forks) = gitweb_check_feature('forks');
 
        my @projects;
        foreach my $pr (@$projlist) {
@@ -2229,8 +2242,14 @@ sub git_project_list_body {
                }
                if ($check_forks) {
                        my $pname = $pr->{'path'};
-                       $pname =~ s/\.git$//;
-                       $pr->{'forks'} = -d "$projectroot/$pname";
+                       if (($pname =~ s/\.git$//) &&
+                           ($pname !~ /\/$/) &&
+                           (-d "$projectroot/$pname")) {
+                               $pr->{'forks'} = "-d $projectroot/$pname";
+                       }
+                       else {
+                               $pr->{'forks'} = 0;
+                       }
                }
                push @projects, $pr;
        }
@@ -2296,6 +2315,7 @@ sub git_project_list_body {
                if ($check_forks) {
                        print "<td>";
                        if ($pr->{'forks'}) {
+                               print "<!-- $pr->{'forks'} -->\n";
                                print $cgi->a({-href => href(project=>$pr->{'path'}, action=>"forks")}, "+");
                        }
                        print "</td>\n";
@@ -2613,7 +2633,9 @@ sub git_summary {
        my @taglist  = git_get_tags_list(15);
        my @headlist = git_get_heads_list(15);
        my @forklist;
-       if (gitweb_check_feature('forks')) {
+       my ($check_forks) = gitweb_check_feature('forks');
+
+       if ($check_forks) {
                @forklist = git_get_projects_list($project);
        }