diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:16 -0800 |
| commit | a75bab51aef5284058afdd04b51923d03dfce5b2 (patch) | |
| tree | b8143e9671b9a3f367403b6acdd88d37f3da6900 /t | |
| parent | Merge branch 'jn/maint-fix-pager' (diff) | |
| parent | gitweb: Fix project-specific feature override behavior (diff) | |
| download | tgif-a75bab51aef5284058afdd04b51923d03dfce5b2.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Fix project-specific feature override behavior
gitweb multiple project roots documentation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9500-gitweb-standalone-no-errors.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index 2fc7fdb124..63b6b060e6 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -591,14 +591,22 @@ test_debug 'cat gitweb.log' # ---------------------------------------------------------------------- # gitweb config and repo config -cat >>gitweb_config.perl <<EOF - -\$feature{'blame'}{'override'} = 1; -\$feature{'snapshot'}{'override'} = 1; -\$feature{'avatar'}{'override'} = 1; +cat >>gitweb_config.perl <<\EOF + +# turn on override for each overridable feature +foreach my $key (keys %feature) { + if ($feature{$key}{'sub'}) { + $feature{$key}{'override'} = 1; + } +} EOF test_expect_success \ + 'config override: projects list (implicit)' \ + 'gitweb_run' +test_debug 'cat gitweb.log' + +test_expect_success \ 'config override: tree view, features not overridden in repo config' \ 'gitweb_run "p=.git;a=tree"' test_debug 'cat gitweb.log' |