mirror of
https://github.com/git/git.git
synced 2024-06-06 10:16:12 +02:00
18547aacf5
In the previous change in this function, we add locale support for single-byte encodings only. It looks like pcre only supports utf-* as multibyte encodings, the others are left in the cold (which is fine). We need to enable PCRE_UTF8 so pcre can find character boundary correctly. It's needed for case folding (when --ignore-case is used) or '*', '+' or similar syntax is used. The "has_non_ascii()" check is to be on the conservative side. If there's non-ascii in the pattern, the searched content could still be in utf-8, but we can treat it just like a byte stream and everything should work. If we force utf-8 based on locale only and pcre validates utf-8 and the file content is in non-utf8 encoding, things break. Noticed-by: Plamen Totev <plamen.totev@abv.bg> Helped-by: Plamen Totev <plamen.totev@abv.bg> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
65 lines
2.0 KiB
Bash
Executable File
65 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='grep icase on non-English locales'
|
|
|
|
. ./lib-gettext.sh
|
|
|
|
test_expect_success GETTEXT_LOCALE 'setup' '
|
|
test_write_lines "TILRAUN: Halló Heimur!" >file &&
|
|
git add file &&
|
|
LC_ALL="$is_IS_locale" &&
|
|
export LC_ALL
|
|
'
|
|
|
|
test_have_prereq GETTEXT_LOCALE &&
|
|
test-regex "HALLÓ" "Halló" ICASE &&
|
|
test_set_prereq REGEX_LOCALE
|
|
|
|
test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
|
|
git grep -i "TILRAUN: Halló Heimur!" &&
|
|
git grep -i "TILRAUN: HALLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 icase' '
|
|
git grep --perl-regexp "TILRAUN: H.lló Heimur!" &&
|
|
git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
|
|
git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
|
|
'
|
|
|
|
test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 string with "+"' '
|
|
test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
|
|
git add file2 &&
|
|
git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
|
|
echo file >expected &&
|
|
echo file2 >>expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
|
|
git grep --debug -i -F "TILRAUN: Halló Heimur!" 2>&1 >/dev/null |
|
|
grep fixed >debug1 &&
|
|
test_write_lines "fixed TILRAUN: Halló Heimur!" >expect1 &&
|
|
test_cmp expect1 debug1 &&
|
|
|
|
git grep --debug -i -F "TILRAUN: HALLÓ HEIMUR!" 2>&1 >/dev/null |
|
|
grep fixed >debug2 &&
|
|
test_write_lines "fixed TILRAUN: HALLÓ HEIMUR!" >expect2 &&
|
|
test_cmp expect2 debug2
|
|
'
|
|
|
|
test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
|
|
test_write_lines "^*TILR^AUN:.* \\Halló \$He[]imur!\$" >file &&
|
|
|
|
git grep --debug -i -F "^*TILR^AUN:.* \\Halló \$He[]imur!\$" 2>&1 >/dev/null |
|
|
grep fixed >debug1 &&
|
|
test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\Halló \$He\\[]imur!\\\$" >expect1 &&
|
|
test_cmp expect1 debug1 &&
|
|
|
|
git grep --debug -i -F "^*TILR^AUN:.* \\HALLÓ \$HE[]IMUR!\$" 2>&1 >/dev/null |
|
|
grep fixed >debug2 &&
|
|
test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\HALLÓ \$HE\\[]IMUR!\\\$" >expect2 &&
|
|
test_cmp expect2 debug2
|
|
'
|
|
|
|
test_done
|