Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
gitweb: move hard coded .git suffix out of git_get_projects_list
author
Bernhard R. Link
<brl+git@mail.brlink.eu>
Mon, 30 Jan 2012 20:05:47 +0000
(21:05 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 1 Feb 2012 20:52:33 +0000
(12:52 -0800)
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 <brlink@debian.org>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb/gitweb.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
828ea97
)
diff --git
a/gitweb/gitweb.perl
b/gitweb/gitweb.perl
index abb5a79afce445c73693593d32cced0ccdb90fe3..e074cd7c632d0c75f4e51573e43de2f073f65fa4 100755
(executable)
--- a/
gitweb/gitweb.perl
+++ b/
gitweb/gitweb.perl
@@
-2829,8
+2829,6
@@
sub git_get_projects_list {
my $filter = shift || '';
my @list;
my $filter = shift || '';
my @list;
- $filter =~ s/\.git$//;
-
if (-d $projects_list) {
# search in directory
my $dir = $projects_list;
if (-d $projects_list) {
# search in directory
my $dir = $projects_list;
@@
-6005,7
+6003,9
@@
sub git_forks {
die_error(400, "Unknown order parameter");
}
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");
}
if (!@list) {
die_error(404, "No forks found");
}
@@
-6064,7
+6064,9
@@
sub git_summary {
if ($check_forks) {
# find forks of a project
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);
# filter out forks of forks
@forklist = filter_forks_from_projects_list(\@forklist)
if (@forklist);