mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  gitweb: Fix project-specific feature override behavior
  gitweb multiple project roots documentation
This commit is contained in:
Junio C Hamano
2010-03-02 12:44:16 -08:00
parent 52ebb06f14 9be3614eff
commit a75bab51ae
3 changed files with 84 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gitweb/gitweb.perl
View File

@ -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,9 @@ sub config_to_multi {
sub git_get_project_config {
my ($key, $type) = @_;
# do we have project
return unless (defined $project && defined $git_dir);
# key sanity check
return unless ($key);
$key =~ s/^gitweb\.//;