]> git.proxmox.com Git - libgit2.git/commitdiff
Don't always test composed-insensitive lookups
authorRussell Belfer <rb@github.com>
Thu, 8 May 2014 21:48:27 +0000 (14:48 -0700)
committerRussell Belfer <rb@github.com>
Thu, 8 May 2014 21:48:27 +0000 (14:48 -0700)
Only on a filesystem that is composed/decomposed insensitive,
should be testing that a branch can be looked up by the opposite
form and still work correctly.

tests/refs/branches/create.c

index 518d4e93e676b53379dd9d4a7d35fe600a82b802..864640ab35cdbf3d2691231654326cfe4742d25b 100644 (file)
@@ -167,16 +167,16 @@ void test_refs_branches_create__can_create_branch_with_unicode(void)
        const char *alt[] = { nfd, nfc, NULL };
        const char *expected[] = { nfc, nfd, emoji };
        unsigned int i;
+       bool fs_decompose_unicode =
+               git_path_does_fs_decompose_unicode(git_repository_path(repo));
 
        retrieve_known_commit(&target, repo);
 
        if (cl_repo_get_bool(repo, "core.precomposeunicode"))
                expected[1] = nfc;
-#ifdef __APPLE__
        /* test decomp. because not all Mac filesystems decompose unicode */
-       else if (git_path_does_fs_decompose_unicode(git_repository_path(repo)))
+       else if (fs_decompose_unicode)
                expected[0] = nfd;
-#endif
 
        for (i = 0; i < ARRAY_SIZE(names); ++i) {
                cl_git_pass(git_branch_create(
@@ -185,7 +185,7 @@ void test_refs_branches_create__can_create_branch_with_unicode(void)
                        git_reference_target(branch), git_commit_id(target)));
 
                assert_branch_matches_name(expected[i], names[i]);
-               if (alt[i])
+               if (fs_decompose_unicode && alt[i])
                        assert_branch_matches_name(expected[i], alt[i]);
 
                cl_git_pass(git_branch_delete(branch));