X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gitweb%2Fgitweb.perl;h=a2d2283ec921acac7b068537eb85f63c16de9556;hb=60335534a6ac52d4d3a372a5b56df5a57a4463d1;hp=32b04a469e0d3fb824bdcd604fb7051925be62b3;hpb=ca97d26cc612348baa423475adfb48194386b4a5;p=git.git diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 32b04a469..c356e95f1 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -454,7 +454,11 @@ sub gitweb_get_feature { $feature{$name}{'sub'}, $feature{$name}{'override'}, @{$feature{$name}{'default'}}); - if (!$override) { return @defaults; } + # project specific override is possible only if we have project + our $git_dir; # global variable, declared later + if (!$override || !defined $git_dir) { + return @defaults; + } if (!defined $sub) { warn "feature $name is not overridable"; return @defaults; @@ -2212,6 +2216,8 @@ sub config_to_multi { sub git_get_project_config { my ($key, $type) = @_; + return unless defined $git_dir; + # key sanity check return unless ($key); $key =~ s/^gitweb\.//;