On 2016-03-22 21.44, Junio C Hamano wrote: > Torsten Bögershausen <tbo...@web.de> writes: > >> On 2016-03-22 18.43, Johannes Schindelin wrote: >>> These two tests wanted to write file names which are incompatible with >>> Windows' file naming rules. >>> >>> Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> >> >> Is there a chance to squeeze in a precondition for HFS under Mac OS ? > > So you want this squashed into it? Yes, please. > > t/t9115-git-svn-dcommit-funky-renames.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh > b/t/t9115-git-svn-dcommit-funky-renames.sh > index 864395e..a87d3d3 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,!MINGW 'svn.pathnameencoding=cp932 new file on > dcommit' ' > +test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 > new file on dcommit' ' > LC_ALL=$a_utf8_locale && > export LC_ALL && > neq=$(printf "\201\202") && > @@ -105,7 +105,7 @@ test_expect_success UTF8,!MINGW > 'svn.pathnameencoding=cp932 new file on dcommit' > ' > > # See the comment on the above test for setting of LC_ALL. > -test_expect_success !MINGW 'svn.pathnameencoding=cp932 rename on dcommit' ' > +test_expect_success !MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 > rename on dcommit' ' > LC_ALL=$a_utf8_locale && > export LC_ALL && > inf=$(printf "\201\207") &&
-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
