Merge branch 'bc/archive-pax-header-mode'

diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index fe0164be62ad9ae7a2ea426c6e576cd1133f3d67..4807b0f015d4b87aa762c0f7585d863a1dc34514 100755 (executable)
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -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