[PATCH] t7400: test of UTF-8 submodule names pass under Mac OS

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Signed-off-by: Torsten Bögershausen <tboegi@xxxxxx>
---
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(-)

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 0376370..fedfa5b 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -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
-- 
1.8.3

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]