From: Elia Pinto <gitter.spiros@gmail.com>
Date: Fri, 6 Jun 2014 14:55:54 +0000 (-0700)
Subject: t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
X-Git-Tag: v2.1.0-rc0~79^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce5dadb6165c58f6a3a121a9373e6d3ae23b35b4;p=thirdparty%2Fgit.git

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>
---

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"