test prerequisites: enumerate with commas

diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index f37ac8fa0b720d1a72536033c3334a6f5244d5d7..4807b0f015d4b87aa762c0f7585d863a1dc34514 100755 (executable)
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -12,7 +12,7 @@ test_expect_success setup '
 
        git config core.autocrlf false &&
 
-       echo "one text" > .gitattributes
+       echo "one text" > .gitattributes &&
 
        for w in Hello world how are you; do echo $w; done >one &&
        for w in I am very very fine thank you; do echo $w; done >two &&
@@ -20,8 +20,8 @@ test_expect_success setup '
 
        git commit -m initial &&
 
-       one=`git rev-parse HEAD:one` &&
-       two=`git rev-parse HEAD:two` &&
+       one=$(git rev-parse HEAD:one) &&
+       two=$(git rev-parse HEAD:two) &&
 
        echo happy.
 '
@@ -34,9 +34,9 @@ test_expect_success 'eol=lf puts LFs in normalized file' '
 
        ! has_cr one &&
        ! has_cr two &&
-       onediff=`git diff one` &&
-       twodiff=`git diff two` &&
-       test -z "$onediff" -a -z "$twodiff"
+       onediff=$(git diff one) &&
+       twodiff=$(git diff two) &&
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_expect_success 'eol=crlf puts CRLFs in normalized file' '
@@ -47,9 +47,9 @@ test_expect_success 'eol=crlf puts CRLFs in normalized file' '
 
        has_cr one &&
        ! has_cr two &&
-       onediff=`git diff one` &&
-       twodiff=`git diff two` &&
-       test -z "$onediff" -a -z "$twodiff"
+       onediff=$(git diff one) &&
+       twodiff=$(git diff two) &&
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_expect_success 'autocrlf=true overrides eol=lf' '
@@ -61,9 +61,9 @@ test_expect_success 'autocrlf=true overrides eol=lf' '
 
        has_cr one &&
        has_cr two &&
-       onediff=`git diff one` &&
-       twodiff=`git diff two` &&
-       test -z "$onediff" -a -z "$twodiff"
+       onediff=$(git diff one) &&
+       twodiff=$(git diff two) &&
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_expect_success 'autocrlf=true overrides unset eol' '
@@ -75,9 +75,9 @@ test_expect_success 'autocrlf=true overrides unset eol' '
 
        has_cr one &&
        has_cr two &&
-       onediff=`git diff one` &&
-       twodiff=`git diff two` &&
-       test -z "$onediff" -a -z "$twodiff"
+       onediff=$(git diff one) &&
+       twodiff=$(git diff two) &&
+       test -z "$onediff" && test -z "$twodiff"
 '
 
 test_done