]> granicus.if.org Git - git/commitdiff
test: correct detection of UTF8_NFD_TO_NFC for APFS
authorTorsten Bögershausen <tboegi@web.de>
Mon, 30 Apr 2018 06:35:19 +0000 (08:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 May 2018 22:52:32 +0000 (07:52 +0900)
On HFS (which is the default Mac filesystem prior to High Sierra),
unicode names are "decomposed" before recording.
On APFS, which appears to be the new default filesystem in Mac OS High
Sierra, filenames are recorded as specified by the user.

APFS continues to allow the user to access it via any name
that normalizes to the same thing.

This difference causes t0050-filesystem.sh to fail two tests.

Improve the test for a NFD/NFC in test-lib.sh:
Test if the same file can be reached in pre- and decomposed unicode.

Reported-By: Elijah Newren <newren@gmail.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Tested-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/test-lib.sh

index 5fbd8d4a90b3b88cf57ca53c6b1fe99d5a957460..8abd135a4715757e67ecf7d4dba1274457bb9799 100644 (file)
@@ -1092,12 +1092,7 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
        auml=$(printf "\303\244")
        aumlcdiar=$(printf "\141\314\210")
        >"$auml" &&
-       case "$(echo *)" in
-       "$aumlcdiar")
-               true ;;
-       *)
-               false ;;
-       esac
+       test -f "$aumlcdiar"
 '
 
 test_lazy_prereq AUTOIDENT '