diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:39:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:39:59 -0700 |
| commit | f2ded0f807da72d2bac8cdb7f332a91f5ea5ee72 (patch) | |
| tree | 67820bf44cea87bdb5f21e5a3dcb9b0bc1184b07 /t | |
| parent | Merge branch 'kk/tests-with-no-perl' (diff) | |
| parent | Set core.precomposeunicode to true on e.g. HFS+ (diff) | |
| download | tgif-f2ded0f807da72d2bac8cdb7f332a91f5ea5ee72.tar.xz | |
Merge branch 'tb/precompose-autodetect-fix'
On MacOS X, we detected if the filesystem needs the "pre-composed
unicode strings" workaround, but did not automatically enable it.
Now we do.
* tb/precompose-autodetect-fix:
Set core.precomposeunicode to true on e.g. HFS+
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0050-filesystem.sh | 1 | ||||
| -rwxr-xr-x | t/t3910-mac-os-precompose.sh | 2 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 05d78d22a6..6b3cedcf24 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -91,6 +91,7 @@ test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' ' test_expect_success "setup unicode normalization tests" ' test_create_repo unicode && cd unicode && + git config core.precomposeunicode false && touch "$aumlcdiar" && git add "$aumlcdiar" && git commit -m initial && diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh index 5fe57c5438..e4ba6013e4 100755 --- a/t/t3910-mac-os-precompose.sh +++ b/t/t3910-mac-os-precompose.sh @@ -36,7 +36,7 @@ Alongc=$Alongc$AEligatu$AEligatu #254 Byte test_expect_success "detect if nfd needed" ' precomposeunicode=`git config core.precomposeunicode` && - test "$precomposeunicode" = false && + test "$precomposeunicode" = true && git config core.precomposeunicode true ' test_expect_success "setup" ' diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 4192fe0ec6..10f89bd0ce 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -962,7 +962,6 @@ test_expect_success 'submodule with UTF-8 name' ' git add sub && git commit -m "init sub" ) && - test_config core.precomposeunicode true && git submodule add ./"$svname" && git submodule >&2 && test -n "$(git submodule | grep "$svname")" |