From: Julien Muchembled <redacted>
Date: Fri, 21 Oct 2011 19:04:21 +0000 (+0200)
Subject: gitweb: fix regression when filtering out forks
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/add99f03690b38bbc54ed03d13c18bb3d2396bc3a5ecf0dcb642ebe6ff909dcd

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 <redacted>
Tested-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/gitweb.perl b/gitweb.perl
index 944898b..09a9951 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2889,7 +2889,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