diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:18:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:18:34 -0800 |
| commit | 373654ee0f568fdeab891c621d6a1ac6b0c15d3a (patch) | |
| tree | 874b0b65f053953d102e53830492002c12275ecd /gitweb/gitweb.perl | |
| parent | 9c6c304d6a01b72d7ce20722b80ca62e01fe8356 (diff) | |
| parent | 936b7057e8401665a2d106e8de018561db6333fe (diff) | |
| download | git-373654ee0f568fdeab891c621d6a1ac6b0c15d3a.tar.gz | |
Merge branch 'maint'
* maint:
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
gitweb: Fix export check in git_get_projects_list
Conflicts:
RelNotes
Diffstat (limited to 'gitweb/gitweb.perl')
| -rwxr-xr-x | gitweb/gitweb.perl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 8f574c7b36..99f71b47c2 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2147,8 +2147,9 @@ sub git_get_projects_list { my $subdir = substr($File::Find::name, $pfxlen + 1); # we check related file in $projectroot - if (check_export_ok("$projectroot/$filter/$subdir")) { - push @list, { path => ($filter ? "$filter/" : '') . $subdir }; + my $path = ($filter ? "$filter/" : '') . $subdir; + if (check_export_ok("$projectroot/$path")) { + push @list, { path => $path }; $File::Find::prune = 1; } }, |