summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-11 13:27:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-11 13:27:01 -0700
commita6ca9ee9e0e30bc96afbdc7d99acf411fbf409c0 (patch)
tree16cb7c88f641b30aaab55ba869eb29e6f922fd44
parentMerge branch 'ks/commit-abort-on-empty-message-fix' (diff)
parentgitweb: skip unreadable subdirectories (diff)
downloadtgif-a6ca9ee9e0e30bc96afbdc7d99acf411fbf409c0.tar.xz
Merge branch 'hb/gitweb-project-list'
When a directory is not readable, "gitweb" fails to build the project list. Work this around by skipping such a directory. * hb/gitweb-project-list: gitweb: skip unreadable subdirectories
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3d4a8ee27c..9208f42ed1 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3071,6 +3071,8 @@ sub git_get_projects_list {
return if (m!^[/.]$!);
# only directories can be git repositories
return unless (-d $_);
+ # need search permission
+ return unless (-x $_);
# don't traverse too deep (Find is super slow on os x)
# $project_maxdepth excludes depth of $projectroot
if (($File::Find::name =~ tr!/!!) - $pfxdepth > $project_maxdepth) {