gitweb: simplify gitweb.min.* generation and clean-up rules

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 77b63fcbcb8989780cf93380f9385e1abbf28ff5055b0fb5aa290d4cadc88bde..d2bb028a66e95965b0304cd801b0bf6cc2432a0550233c2ad5e5cc5c8f4f11f5 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -455,7 +455,11 @@ sub gitweb_get_feature {
                $feature{$name}{'sub'},
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});
                $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;
        if (!defined $sub) {
                warn "feature $name is not overridable";
                return @defaults;


@@ -2213,6 +2217,8 @@ sub config_to_multi {
 sub git_get_project_config {
        my ($key, $type) = @_;
 
 sub git_get_project_config {
        my ($key, $type) = @_;
 

+       return unless defined $git_dir;
+

        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;
        # key sanity check
        return unless ($key);
        $key =~ s/^gitweb\.//;