Skip to content

Commit 742ae10

Browse files
tboegigitster
authored andcommitted
test: correct detection of UTF8_NFD_TO_NFC for APFS
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 <[email protected]> Signed-off-by: Torsten Bögershausen <[email protected]> Tested-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fc849d8 commit 742ae10

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

t/test-lib.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,12 +1092,7 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
10921092
auml=$(printf "\303\244")
10931093
aumlcdiar=$(printf "\141\314\210")
10941094
>"$auml" &&
1095-
case "$(echo *)" in
1096-
"$aumlcdiar")
1097-
true ;;
1098-
*)
1099-
false ;;
1100-
esac
1095+
test -f "$aumlcdiar"
11011096
'
11021097

11031098
test_lazy_prereq AUTOIDENT '

0 commit comments

Comments
 (0)