diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-31 09:27:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 09:27:39 -0800 |
| commit | cdab165df44baf3464ae1e5ddff6d04a65e02304 (patch) | |
| tree | 8eaf89f11acc601bd123de9ecb1e42055e89ecee | |
| parent | 895fd51a434ac50ebd53e996bd9149302ca3e134 (diff) | |
| parent | 9af7fbc37d8a99cc58e9d890106644ad5c3ccdc7 (diff) | |
| download | libgit2-cdab165df44baf3464ae1e5ddff6d04a65e02304.tar.gz | |
Merge pull request #4490 from libgit2/ethomson/apfs_precompose_fixes
status::renames: test update for APFS (write NFD instead of NFC filename)
| -rw-r--r-- | tests/status/renames.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/status/renames.c b/tests/status/renames.c index f482d693a..ae32d2ee0 100644 --- a/tests/status/renames.c +++ b/tests/status/renames.c @@ -590,6 +590,12 @@ static char *nfc = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D"; static char *nfd = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D"; #endif +/* + * Create a file in NFD (canonically decomposed) format. Ensure + * that when core.precomposeunicode is false that we return paths + * in NFD, but when core.precomposeunicode is true, then we + * return paths precomposed (in NFC). + */ void test_status_renames__precomposed_unicode_rename(void) { #ifdef GIT_USE_ICONV @@ -610,7 +616,7 @@ void test_status_renames__precomposed_unicode_rename(void) { GIT_STATUS_WT_RENAMED, "sixserving.txt", nfc }, }; - rename_file(g_repo, "sixserving.txt", nfc); + rename_file(g_repo, "sixserving.txt", nfd); opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; |