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>
Elia Pinto committed
Jun 6, 2014 at 07:55 UTC
ce5dadb6165c58f6a3a121a9373e6d3ae23b35b4
1 file changed
+1
-1
t/lib-httpd.sh
+1
-1
@@ -132,7 +132,7 @@ prepare_httpd() {
132
HTTPD_URL_USER=$HTTPD_PROTO://user%40host@$HTTPD_DEST
133
HTTPD_URL_USER_PASS=$HTTPD_PROTO://user%40host:pass%40host@$HTTPD_DEST
134
135
- if test -n "$LIB_HTTPD_DAV" -o -n "$LIB_HTTPD_SVN"
135
+ if test -n "$LIB_HTTPD_DAV" || test -n "$LIB_HTTPD_SVN"
136
then
137
HTTPD_PARA="$HTTPD_PARA -DDAV"
138