summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:16:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:16:30 (GMT)
commitaface4c3904de688ced9cecad4ac07bc3afeec8f (patch)
treeaf5b76bd9a4a82cfe68f13a6d168211f8e07e894
parent9c0c09f791b1bfd2a04aa0e48190d304627293d2 (diff)
parent53c632faab0be2e8510a678a4b7dfa01dc7f41e1 (diff)
downloadgit-aface4c3904de688ced9cecad4ac07bc3afeec8f.zip
git-aface4c3904de688ced9cecad4ac07bc3afeec8f.tar.gz
git-aface4c3904de688ced9cecad4ac07bc3afeec8f.tar.bz2
Merge branch 'jm/maint-gitweb-filter-forks-fix'
* 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 85d64b2..a95226e 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