summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-08 16:26:50 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-08 16:26:50 -0800
commit1a61a9dae874cac9ea40ac63f8fd662f62eee97e (patch)
tree13dad475c0fe092e84cac33d41c0f9eac1fd59b3
parent992499d8532c107f0f77163de4376ed2e0fd05a0 (diff)
parent53c632faab0be2e8510a678a4b7dfa01dc7f41e1 (diff)
downloadgit-1a61a9dae874cac9ea40ac63f8fd662f62eee97e.tar.gz
Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint
* jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 85d64b244d..a95226e089 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2886,7 +2886,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