diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:33:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:33:44 -0700 |
commit | b9e56be086ffa4f8431082a6fb25225e79e5bbc8 (patch) | |
tree | 3616341c381b61da444f3b0478d8626988658ee4 | |
parent | 01ced48994640b7d6fd72289544e766dc9009de7 (diff) | |
parent | 46a13857fc036b54ac2ddd0a218e5cc171aa7bd9 (diff) | |
download | git-b9e56be086ffa4f8431082a6fb25225e79e5bbc8.tar.gz |
Merge branch 'hb/gitweb-project-list' into maint
When a directory is not readable, "gitweb" fails to build the
project list. Work this around by skipping such a directory.
It might end up hiding a problem under the rug and a better
solution might be to loudly complain to the administrator pointing
out the problematic directory, but this will at least make it
"work".
* hb/gitweb-project-list:
gitweb: skip unreadable subdirectories
-rwxr-xr-x | gitweb/gitweb.perl | 2 |
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) { |