Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index e1126aa7cc05ff61ddf087fe13880da7f48219a6..4807b0f015d4b87aa762c0f7585d863a1dc34514 100755 (executable)
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -36,7 +36,7 @@ test_expect_success 'eol=lf puts LFs in normalized file' '
        ! has_cr two &&
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
-       test -z "$onediff" -a -z "$twodiff"
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_expect_success 'eol=crlf puts CRLFs in normalized file' '
@@ -49,7 +49,7 @@ test_expect_success 'eol=crlf puts CRLFs in normalized file' '
        ! has_cr two &&
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
-       test -z "$onediff" -a -z "$twodiff"
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_expect_success 'autocrlf=true overrides eol=lf' '
@@ -63,7 +63,7 @@ test_expect_success 'autocrlf=true overrides eol=lf' '
        has_cr two &&
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
-       test -z "$onediff" -a -z "$twodiff"
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_expect_success 'autocrlf=true overrides unset eol' '
@@ -77,7 +77,7 @@ test_expect_success 'autocrlf=true overrides unset eol' '
        has_cr two &&
        onediff=$(git diff one) &&
        twodiff=$(git diff two) &&
-       test -z "$onediff" -a -z "$twodiff"
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_done