diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-04 08:10:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 08:10:08 (GMT) |
| commit | 2dfffd3e09b2541b1bfcc840a65eac0251832175 (patch) | |
| tree | c65f6dc94b1aa048e5e121ae2422c08e7c5c236e /t | |
| parent | 33e12acafec40ac7c44629e22cf050e506bb0706 (diff) | |
| parent | 0e121a2cd42d28bc4034feedf8a13c5a91f85bd3 (diff) | |
| download | git-2dfffd3e09b2541b1bfcc840a65eac0251832175.zip git-2dfffd3e09b2541b1bfcc840a65eac0251832175.tar.gz git-2dfffd3e09b2541b1bfcc840a65eac0251832175.tar.bz2 | |
Merge branch 'jn/gitweb'
* jn/gitweb:
gitweb: Use config file for repository description and URLs
gitweb: Read repo config using 'git config -z -l'
gitweb: Add tests for overriding gitweb config with repo config
gitweb: Use href(-replay=>1, action=>...) to generate alternate views
gitweb: Use href(-replay=>1, page=>...) to generate pagination links
gitweb: Easier adding/changing parameters to current URL
gitweb: Remove CGI::Carp::set_programname() call from t9500 gitweb test
gitweb: Add 'status_str' to parse_difftree_raw_line output
gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9500-gitweb-standalone-no-errors.sh | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh index f7bad5b..35fff3d 100755 --- a/t/t9500-gitweb-standalone-no-errors.sh +++ b/t/t9500-gitweb-standalone-no-errors.sh @@ -31,7 +31,6 @@ our \$projects_list = ""; our \$export_ok = ""; our \$strict_export = ""; -CGI::Carp::set_programname("gitweb/gitweb.cgi"); EOF cat >.git/description <<EOF @@ -558,4 +557,27 @@ test_expect_success \ 'gitweb_run "p=.git;a=tree;opt=--no-merges"' test_debug 'cat gitweb.log' +# ---------------------------------------------------------------------- +# gitweb config and repo config + +cat >>gitweb_config.perl <<EOF + +\$feature{'blame'}{'override'} = 1; +\$feature{'snapshot'}{'override'} = 1; +EOF + +test_expect_success \ + 'config override: tree view, features disabled in repo config' \ + 'git config gitweb.blame no && + git config gitweb.snapshot none && + gitweb_run "p=.git;a=tree"' +test_debug 'cat gitweb.log' + +test_expect_success \ + 'config override: tree view, features enabled in repo config' \ + 'git config gitweb.blame yes && + git config gitweb.snapshot "zip,tgz, tbz2" && + gitweb_run "p=.git;a=tree"' +test_debug 'cat gitweb.log' + test_done |