From: Bernhard R. Link Date: Mon, 30 Jan 2012 20:05:47 +0000 (+0100) Subject: gitweb: move hard coded .git suffix out of git_get_projects_list X-Git-Tag: v1.7.10-rc0~84^2~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4c7cd177148c0ae018e1f1d1c037d296d50d3562;p=git.git gitweb: move hard coded .git suffix out of git_get_projects_list Use of the filter option of git_get_projects_list is currently limited to forks. It hard codes removal of ".git" suffixes from the filter. To make it more generic move the .git suffix removal to the callers. Signed-off-by: Bernhard R. Link Acked-by: Jakub Narebski Signed-off-by: Junio C Hamano --- diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index abb5a79af..e074cd7c6 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2829,8 +2829,6 @@ sub git_get_projects_list { my $filter = shift || ''; my @list; - $filter =~ s/\.git$//; - if (-d $projects_list) { # search in directory my $dir = $projects_list; @@ -6005,7 +6003,9 @@ sub git_forks { die_error(400, "Unknown order parameter"); } - my @list = git_get_projects_list($project); + my $filter = $project; + $filter =~ s/\.git$//; + my @list = git_get_projects_list($filter); if (!@list) { die_error(404, "No forks found"); } @@ -6064,7 +6064,9 @@ sub git_summary { if ($check_forks) { # find forks of a project - @forklist = git_get_projects_list($project); + my $filter = $project; + $filter =~ s/\.git$//; + @forklist = git_get_projects_list($filter); # filter out forks of forks @forklist = filter_forks_from_projects_list(\@forklist) if (@forklist);