diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-01-09 15:58:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-09 15:58:30 -0800 |
commit | 242ff87975199687d46bb8cca5207779a3872b6b (patch) | |
tree | 1e7f5836b161de6ad7d8c70b6ec67b6608a61933 | |
parent | e1e3c0694e6b37273820f28a782b927ec345ff2b (diff) | |
parent | ac593b76dde42fa8340fb60e7d6fc315a5be7c40 (diff) | |
download | git-242ff87975199687d46bb8cca5207779a3872b6b.tar.gz git-242ff87975199687d46bb8cca5207779a3872b6b.tar.xz |
Merge branch 'mm/maint-gitweb-project-maxdepth'
* mm/maint-gitweb-project-maxdepth:
gitweb: accept trailing "/" in $project_list
-rwxr-xr-x | gitweb/gitweb.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index fc41b07bc..285fe8840 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2836,8 +2836,8 @@ sub git_get_projects_list { my $dir = $projects_list; # remove the trailing "/" $dir =~ s!/+$!!; - my $pfxlen = length("$projects_list"); - my $pfxdepth = ($projects_list =~ tr!/!!); + my $pfxlen = length("$dir"); + my $pfxdepth = ($dir =~ tr!/!!); # when filtering, search only given subdirectory if ($filter) { $dir .= "/$filter"; |