summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-13 12:36:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-13 12:36:28 -0700
commitd973dc01cc904ae046f6b40911aaf340c04cfdc7 (patch)
tree852fbb9c3010950bdb51e25fb281b009c25da17f
parentMerge branch 'jc/maint-undefined-i18n-observation-test' (diff)
parenti18n: fix auto detection of gettext scheme for shell scripts (diff)
downloadtgif-d973dc01cc904ae046f6b40911aaf340c04cfdc7.tar.xz
Merge branch 'jc/i18n-shell-script-gettext'
The auto detection was testing if a fixed string that is known to be non-empty is empty by mistake. * jc/i18n-shell-script-gettext: i18n: fix auto detection of gettext scheme for shell scripts
-rw-r--r--git-sh-i18n.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index d5fae993b0..6a27f68136 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -21,7 +21,7 @@ GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
if test -n "@@USE_GETTEXT_SCHEME@@"
then
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "@@USE_FALLTHROUGH_GETTEXT_SCHEME@@$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
then
: no probing necessary
elif test -n "$GIT_GETTEXT_POISON"