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/gitweb-lib.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/gitweb-lib.sh')
| -rw-r--r-- | t/gitweb-lib.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh index b9bb95fea..143eb1f24 100644 --- a/t/gitweb-lib.sh +++ b/t/gitweb-lib.sh @@ -82,7 +82,12 @@ gitweb_run () { } close O; ' gitweb.output && - if grep '^[[]' gitweb.log >/dev/null 2>&1; then false; else true; fi + if grep '^[[]' gitweb.log >/dev/null 2>&1; then + test_debug 'cat gitweb.log >&2' && + false + else + true + fi # gitweb.log is left for debugging # gitweb.output is used to parse HTTP output |