[PATCH 1/1] t9115: Skip pathnameencoding=cp932 under HFS

From

tboegi@web.de <tboegi@web.de>

Date

Feb 27, 2016, 18:28 UTC

Message-ID

<1456597724-26497-1-git-send-email-tboegi@web.de>

In-Reply-To

<20160208225806.GA3487@dcvr.yhbt.net>

From: Torsten Bögershausen <tboegi@web.de>

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
 t/t9115-git-svn-dcommit-funky-renames.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 0990f8d..805a9eb 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -93,7 +93,7 @@ test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
 # > to special UNICODE characters in the range 0xf000 to 0xf0ff (the
 # > "Private use area") when creating or accessing files.
 prepare_a_utf8_locale
-test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
+test_expect_success !UTF8_NFD_TO_NFC,UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
 	LC_ALL=$a_utf8_locale &&
 	export LC_ALL &&
 	neq=$(printf "\201\202") &&
@@ -105,10 +105,10 @@ test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
 '
 
 # See the comment on the above test for setting of LC_ALL.
-test_expect_success 'svn.pathnameencoding=cp932 rename on dcommit' '
+test_expect_success !UTF8_NFD_TO_NFC,UTF8 'svn.pathnameencoding=cp932 rename on dcommit' '
 	LC_ALL=$a_utf8_locale &&
 	export LC_ALL &&
-	inf=$(printf "\201\207") &&
+	inf=$(printf "\201\207"o) &&
 	git config svn.pathnameencoding cp932 &&
 	echo inf >"$inf" &&
 	git add "$inf" &&

-- 
2.7.0.303.g2c4f448.dirty