mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/gettext-poison' into maint

Browse Source 
Test updates.

* jk/gettext-poison:
  git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME
  t0205: drop redundant test
This commit is contained in:
Junio C Hamano
2018-03-22 14:24:18 -07:00
parent 34f6f0eca2 3738031581
commit 2e1062d30f
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-sh-i18n.sh
View File

@ -17,15 +17,15 @@ export TEXTDOMAINDIR
# First decide what scheme to use... # First decide what scheme to use...
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
if test -n "@@USE_GETTEXT_SCHEME@@" if test -n "$GIT_GETTEXT_POISON"
then
GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
elif test -n "@@USE_GETTEXT_SCHEME@@"
then then
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
then then
: no probing necessary : no probing necessary
elif test -n "$GIT_GETTEXT_POISON"
then
GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
elif type gettext.sh >/dev/null 2>&1 elif type gettext.sh >/dev/null 2>&1
then then
# GNU libintl's gettext.sh # GNU libintl's gettext.sh

4
t/t0205-gettext-poison.sh
View File

@ -7,10 +7,6 @@ test_description='Gettext Shell poison'
. ./lib-gettext.sh . ./lib-gettext.sh
test_expect_success GETTEXT_POISON "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
'
test_expect_success GETTEXT_POISON 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' ' test_expect_success GETTEXT_POISON 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison" test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
' '