Merge branch 'jc/parseopt-verify-short-name'

diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index e1126aa7cc05ff61ddf087fe13880da7f48219a6..c5203e232c8b6e480e2c3a16dca78d625f364aac 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,27 @@ 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_expect_success NATIVE_CRLF 'eol native is crlf' '
+
+       rm -rf native_eol && mkdir native_eol &&
+       (
+               cd native_eol &&
+               printf "*.txt text\n" >.gitattributes &&
+               printf "one\r\ntwo\r\nthree\r\n" >filedos.txt &&
+               printf "one\ntwo\nthree\n" >fileunix.txt &&
+               git init &&
+               git config core.autocrlf false &&
+               git config core.eol native &&
+               git add filedos.txt fileunix.txt &&
+               git commit -m "first" &&
+               rm file*.txt &&
+               git reset --hard HEAD &&
+               has_cr filedos.txt &&
+               has_cr fileunix.txt
+       )
 '
 
 test_done