t7400: test of UTF-8 submodule names pass under Mac OS
PATCH 1/1 t7400: test of UTF-8 submodule names pass under Mac OS
submodules with names using UTF-8 need core.precomposeunicode true under Mac OS X, set it in the TC.
Improve the portability:
Not all shells on all OS may understand literal UTF-8 strings. Use a help variable filled by printf, as we do it in e.g. t0050.
"strange names" can be called UTF-8, rephrase the heading
---
I wasn't fast enough to catch it on pu:
fg/submodule-non-ascii-path
t/t7400-submodule-basic.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
t/t7400-submodule-basic.sh +8 -5
@@ -889,16 +889,19 @@ test_expect_success 'submodule deinit fails when submodule has a .git directory test -n "$(git config --get-regexp "submodule\.example\.")" ' -test_expect_success 'submodule with strange name works "å äö"' ' - mkdir "å äö" && +svname=$(printf '\303\245 \303\244\303\266') +test_expect_success 'submodule with UTF-8 name' ' + mkdir "$svname" && ( - cd "å äö" && + cd "$svname" && git init && touch sub git add sub git commit -m "init sub" ) - git submodule add "/å äö" && - test -n "$(git submodule | grep "å äö")" + git config core.precomposeunicode true && + git submodule add /"$svname" && + git submodule >&2 && + test -n "$(git submodule | grep "$svname")" ' test_done
Signature · 1 line
1.8.3
Quoted 2 lines · Torsten Bögershausen
submodules with names using UTF-8 need core.precomposeunicode true under Mac OS X, set it in the TC.
I take that TC stands for test case?
Review
Quoted 10 lines
(quoted diff) +3
-1+test_expect_success 'submodule with UTF-8 name' ' + mkdir "$svname" && ( - cd "å äö" && + cd "$svname" && git init && touch sub git add sub git commit -m "init sub" )
While we are at it, let's fix this broken && chain.
Review
Quoted 3 lines
(quoted diff) +1
-2- git submodule add "/å äö" && - test -n "$(git submodule | grep "å äö")" + git config core.precomposeunicode true &&
and use test_config here.
Review
Quoted 5 lines
(quoted diff) +3
-0+ git submodule add /"$svname" && + git submodule >&2 && + test -n "$(git submodule | grep "$svname")" ' test_done
Will queue with an obvious fix-up. Thanks for catching.
-- >8 --
From: Torsten Bögershausen <[email protected]>
submodules with names using UTF-8 need core.precomposeunicode true under Mac OS X, set it in the test case.
Improve the portability:
- Not all shells on all OS may understand literal UTF-8 strings.
- Use a help variable filled by printf, as we do it in e.g. t0050.
"strange names" can be called UTF-8, rephrase the heading.
While at it, unbreak &&-chain in the test, and use test_config.
--- t/t7400-submodule-basic.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
t/t7400-submodule-basic.sh +11 -8
@@ -868,16 +868,19 @@ test_expect_success 'submodule deinit fails when submodule has a .git directory test -n "$(git config --get-regexp "submodule\.example\.")" ' -test_expect_success 'submodule with strange name works "å äö"' ' - mkdir "å äö" && +test_expect_success 'submodule with UTF-8 name' ' + svname=$(printf "\303\245 \303\244\303\266") && + mkdir "$svname" && ( - cd "å äö" && + cd "$svname" && git init && - touch sub - git add sub + >sub && + git add sub && git commit -m "init sub" - ) - git submodule add "/å äö" && - test -n "$(git submodule | grep "å äö")" + ) && + test_config core.precomposeunicode true && + git submodule add ./"$svname" && + git submodule >&2 && + test -n "$(git submodule | grep "$svname")" ' test_done
Signature · 1 line
1.8.3.1-674-g24fae08