t/t0026-eol-config.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
66e1fe7db670bdb03cc7271db11c4934a5684592
1 file changed
+4
-4
t/t0026-eol-config.sh
+4
-4
@@ -36,7 +36,7 @@ test_expect_success 'eol=lf puts LFs in normalized file' '
36
! has_cr two &&
37
onediff=$(git diff one) &&
38
twodiff=$(git diff two) &&
39
- test -z "$onediff" -a -z "$twodiff"
39
+ test -z "$onediff" && test -z "$twodiff"
40
'
41
42
test_expect_success 'eol=crlf puts CRLFs in normalized file' '
@@ -49,7 +49,7 @@ test_expect_success 'eol=crlf puts CRLFs in normalized file' '
49
! has_cr two &&
50
onediff=$(git diff one) &&
51
twodiff=$(git diff two) &&
52
- test -z "$onediff" -a -z "$twodiff"
52
+ test -z "$onediff" && test -z "$twodiff"
53
'
54
55
test_expect_success 'autocrlf=true overrides eol=lf' '
@@ -63,7 +63,7 @@ test_expect_success 'autocrlf=true overrides eol=lf' '
63
has_cr two &&
64
onediff=$(git diff one) &&
65
twodiff=$(git diff two) &&
66
- test -z "$onediff" -a -z "$twodiff"
66
+ test -z "$onediff" && test -z "$twodiff"
67
'
68
69
test_expect_success 'autocrlf=true overrides unset eol' '
@@ -77,7 +77,7 @@ test_expect_success 'autocrlf=true overrides unset eol' '
77
has_cr two &&
78
onediff=$(git diff one) &&
79
twodiff=$(git diff two) &&
80
- test -z "$onediff" -a -z "$twodiff"
80
+ test -z "$onediff" && test -z "$twodiff"
81
'
82
83
test_done