kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2017-08-23 14:33:44 -07:00
parent 01ced48994 46a13857fc
commit b9e56be086
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitweb/gitweb.perl
View File

@ -3071,6 +3071,8 @@ sub git_get_projects_list {
return if (m!^[/.]$!); return if (m!^[/.]$!);
# only directories can be git repositories # only directories can be git repositories
return unless (-d $_); return unless (-d $_);
# need search permission
return unless (-x $_);
# don't traverse too deep (Find is super slow on os x) # don't traverse too deep (Find is super slow on os x)
# $project_maxdepth excludes depth of $projectroot # $project_maxdepth excludes depth of $projectroot
if (($File::Find::name =~ tr!/!!) - $pfxdepth > $project_maxdepth) { if (($File::Find::name =~ tr!/!!) - $pfxdepth > $project_maxdepth) {