diff options
| author | Elia Pinto <gitter.spiros@gmail.com> | 2014-06-06 07:55:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-09 15:53:41 -0700 |
| commit | ce5dadb6165c58f6a3a121a9373e6d3ae23b35b4 (patch) | |
| tree | 75ceedb5241f4d161a2b7736240bb36d9b280cef | |
| parent | e425f6ad4d14d49fee09712af0aa6f56037e7dd7 (diff) | |
| download | git-ce5dadb6165c58f6a3a121a9373e6d3ae23b35b4.tar.gz | |
t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
The construct is error-prone; "test" being built-in in most modern
shells, the reason to avoid "test <cond> && test <cond>" spawning
one extra process by using a single "test <cond> -a <cond>" no
longer exists.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-httpd.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 252cbf163b..38a47fe20e 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -132,7 +132,7 @@ prepare_httpd() { HTTPD_URL_USER=$HTTPD_PROTO://user%40host@$HTTPD_DEST HTTPD_URL_USER_PASS=$HTTPD_PROTO://user%40host:pass%40host@$HTTPD_DEST - if test -n "$LIB_HTTPD_DAV" -o -n "$LIB_HTTPD_SVN" + if test -n "$LIB_HTTPD_DAV" || test -n "$LIB_HTTPD_SVN" then HTTPD_PARA="$HTTPD_PARA -DDAV" |