t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"

devzero2000 · gitster · commit 754b574cf937 · 2014-06-09T15:53:41.000-07:00
The construct is error-prone; "test" being built-in in most modern
shells, the reason to avoid "test &lt;cond&gt; &amp;&amp; test &lt;cond&gt;" spawning
one extra process by using a single "test &lt;cond&gt; -a &lt;cond&gt;" no
longer exists.

Signed-off-by: Elia Pinto &lt;gitter.spiros@gmail.com&gt;
Reviewed-by: Matthieu Moy &lt;Matthieu.Moy@imag.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t5538-push-shallow.sh b/t/t5538-push-shallow.sh
@@ -121,7 +121,7 @@ EOF
 	)
 '
 
-if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then
+if test -n "$NO_CURL" || test -z "$GIT_TEST_HTTPD"; then
 	say 'skipping remaining tests, git built without http support'
 	test_done
 fi

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ EOF`
`121`	`121`	`)`
`122`	`122`	`'`
`123`	`123`
`124`		`-if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then`
	`124`	`+if test -n "$NO_CURL" \|\| test -z "$GIT_TEST_HTTPD"; then`
`125`	`125`	`say 'skipping remaining tests, git built without http support'`
`126`	`126`	`test_done`
`127`	`127`	`fi`