diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:20:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:20:11 -0800 |
commit | a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc (patch) | |
tree | 11a25853c8469f614c21423e9e1c8fc0b05a7284 /t/t9501-gitweb-standalone-http-status.sh | |
parent | 5673d695fcce217b26d1a5956c1184ff62dc74f1 (diff) | |
parent | d5a719e4afbfd74cf5ccf94c2a5b27aa5d06e914 (diff) | |
download | git-a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc.tar.gz git-a66cee2edeb503cb7a589ff9d9efa75dc8f0fedc.tar.xz |
Merge branch 'maint'
* maint:
t/t7500-commit.sh: use test_cmp instead of test
t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
gitweb/gitweb.perl: don't call S_ISREG() with undef
gitweb/gitweb.perl: remove use of qw(...) as parentheses
Diffstat (limited to 't/t9501-gitweb-standalone-http-status.sh')
-rwxr-xr-x | t/t9501-gitweb-standalone-http-status.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh index 18825aff8..26102ee9b 100755 --- a/t/t9501-gitweb-standalone-http-status.sh +++ b/t/t9501-gitweb-standalone-http-status.sh @@ -126,7 +126,6 @@ test_expect_success 'load checking: load too high (default action)' ' grep "Status: 503 Service Unavailable" gitweb.headers && grep "503 - The load average on the server is too high" gitweb.body ' -test_debug 'cat gitweb.log' # just in case test_debug 'cat gitweb.headers' # turn off load checking |