t/t0025-crlf-auto.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/t0025-crlf-auto.sh b/t/t0025-crlf-auto.sh
index b0e5694ebd07b59e80823cd87825cc9ec8187c21..28102de1a0f987b351a423516d394180175a1f13 100755 (executable)
--- a/t/t0025-crlf-auto.sh
+++ b/t/t0025-crlf-auto.sh
@@ -36,7 +36,7 @@ test_expect_success 'default settings cause no changes' '
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
        threediff=$(git diff three) &&
-       test -z "$onediff" -a -z "$twodiff" -a -z "$threediff"
+       test -z "$onediff" && test -z "$twodiff" && test -z "$threediff"
 '
 
 test_expect_success 'crlf=true causes a CRLF file to be normalized' '
@@ -111,7 +111,7 @@ test_expect_success 'autocrlf=true does not normalize CRLF files' '
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
        threediff=$(git diff three) &&
-       test -z "$onediff" -a -z "$twodiff" -a -z "$threediff"
+       test -z "$onediff" && test -z "$twodiff" && test -z "$threediff"
 '
 
 test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' '
@@ -126,7 +126,7 @@ test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' '
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
        threediff=$(git diff three) &&
-       test -z "$onediff" -a -n "$twodiff" -a -z "$threediff"
+       test -z "$onediff" && test -n "$twodiff" && test -z "$threediff"
 '
 
 test_expect_success 'text=auto, autocrlf=true does not normalize binary files' '