gitweb: make remote_heads config setting work

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 8d9e568de66c7c5b7cf1a6bfc007940fb00e286514eafef756d383cd9cb803c3..6c9d36c9dc87d2659c862da80c07a3a9cac69bd4c89a870c73a070d0aae85802 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -541,7 +541,7 @@ our %feature = (
        # $feature{'remote_heads'}{'default'} = [1];
        # To have project specific config enable override in $GITWEB_CONFIG
        # $feature{'remote_heads'}{'override'} = 1;
        # $feature{'remote_heads'}{'default'} = [1];
        # To have project specific config enable override in $GITWEB_CONFIG
        # $feature{'remote_heads'}{'override'} = 1;

-       # and in project config gitweb.remote_heads = 0|1;
+       # and in project config gitweb.remoteheads = 0|1;

        'remote_heads' => {
                'sub' => sub { feature_bool('remote_heads', @_) },
                'override' => 0,
        'remote_heads' => {
                'sub' => sub { feature_bool('remote_heads', @_) },
                'override' => 0,


@@ -2697,12 +2697,15 @@ sub git_get_project_config {
        # only subsection, if exists, is case sensitive,
        # and not lowercased by 'git config -z -l'
        if (my ($hi, $mi, $lo) = ($key =~ /^([^.]*)\.(.*)\.([^.]*)$/)) {
        # only subsection, if exists, is case sensitive,
        # and not lowercased by 'git config -z -l'
        if (my ($hi, $mi, $lo) = ($key =~ /^([^.]*)\.(.*)\.([^.]*)$/)) {

+               $lo =~ s/_//g;

                $key = join(".", lc($hi), $mi, lc($lo));
                $key = join(".", lc($hi), $mi, lc($lo));

+               return if ($lo =~ /\W/ || $hi =~ /\W/);

        } else {
                $key = lc($key);
        } else {
                $key = lc($key);

+               $key =~ s/_//g;
+               return if ($key =~ /\W/);

        }
        $key =~ s/^gitweb\.//;
        }
        $key =~ s/^gitweb\.//;

-       return if ($key =~ m/\W/);

 
        # type sanity check
        if (defined $type) {
 
        # type sanity check
        if (defined $type) {