gitweb: Check git base URLs before generating URL from it
gitweb/gitweb.perl our $strict_export = "++GITWEB_STRICT_EX · line 83
Quoted 4 lines · Junio C Hamano
Wouldn't this be simpler and more to the point, I wonder?
gitweb/gitweb.perl +1
-1-our @git_base_url_list = ("++GITWEB_BASE_URL++"); +our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++");
Yes, that would be cartainly better.
Signature · 3 lines
Jakub Narebski Warsaw, Poland ShadeHawk on #git
Wouldn't this be simpler and more to the point, I wonder?
gitweb/gitweb.perl +1 -1
@@ -80,7 +80,7 @@ our $strict_export = "++GITWEB_STRICT_EX # list of git base URLs used for URL to where fetch project from, # i.e. full URL is "$git_base_url/$project" -our @git_base_url_list = ("++GITWEB_BASE_URL++"); +our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++"); # default blob_plain mimetype and default charset for text/plain blob our $default_blob_plain_mimetype = 'text/plain';
PATCH 1/1 gitweb: Check git base URLs before generating URL from it
Check if each of git base URLs in @git_base_url_list is true before appending "/$project" to it to generate project URL.
This fixes the error that for default configuration for gitweb in Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being "" in gitweb.cgi), we had URL of "/$project" in the summary view.
Signed-off-by Jakub Narebski <[email protected]>
---
I don't think that anybody would want base URL of "0".
gitweb/gitweb.perl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
gitweb/gitweb.perl +2 -1
@@ -2516,7 +2516,8 @@ sub git_summary { # or make project git URL from git base URL and project name my $url_tag = "URL"; my @url_list = git_get_project_url_list($project); - @url_list = map { "$_/$project" } @git_base_url_list unless @url_list; + @url_list = map { $_ ? "$_/$project" : () } + @git_base_url_list unless @url_list; foreach my $git_url (@url_list) { next unless $git_url; print "<tr><td>$url_tag</td><td>$git_url</td></tr>\n";
Signature · 1 line
1.4.3.3