From: Julien Muchembled Date: Fri, 21 Oct 2011 19:04:21 +0000 (+0200) Subject: gitweb: fix regression when filtering out forks X-Git-Tag: v1.7.8-rc0~13^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53c632faab0be2e8510a678a4b7dfa01dc7f41e1;p=git.git gitweb: fix regression when filtering out forks This fixes a condition in filter_forks_from_projects_list that failed if process directory was different from project root: in such case, the subroutine was a no-op and forks were not detected. Signed-off-by: Julien Muchembled Tested-by: Jakub Narebski Signed-off-by: Junio C Hamano --- diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 014b33b50..10cae7263 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2741,7 +2741,7 @@ sub filter_forks_from_projects_list { $path =~ s/\.git$//; # forks of 'repo.git' are in 'repo/' directory next if ($path =~ m!/$!); # skip non-bare repositories, e.g. 'repo/.git' next unless ($path); # skip '.git' repository: tests, git-instaweb - next unless (-d $path); # containing directory exists + next unless (-d "$projectroot/$path"); # containing directory exists $pr->{'forks'} = []; # there can be 0 or more forks of project # add to trie