Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jm/maint-gitweb-filter-forks-fix'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2011 23:16:30 +0000
(16:16 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2011 23:16:30 +0000
(16:16 -0700)
* jm/maint-gitweb-filter-forks-fix:
gitweb: fix regression when filtering out forks
gitweb/gitweb.perl
patch
|
blob
|
history
raw
(from parent 1:
9c0c09f
)
diff --git
a/gitweb/gitweb.perl
b/gitweb/gitweb.perl
index 85d64b244dead86132de8a2a980cfbfc27c86494..a95226e089fa22d7041e4374382bb2709da10df1 100755
(executable)
--- 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