summaryrefslogtreecommitdiff
path: root/git-sh-i18n.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-13 19:36:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-13 19:36:28 (GMT)
commitd973dc01cc904ae046f6b40911aaf340c04cfdc7 (patch)
tree852fbb9c3010950bdb51e25fb281b009c25da17f /git-sh-i18n.sh
parent8de55e37dd17f212162467f5d26dc3e28346d10e (diff)
parentac06116d44ae3738e7ad0f711074186e006a1eb5 (diff)
downloadgit-d973dc01cc904ae046f6b40911aaf340c04cfdc7.zip
git-d973dc01cc904ae046f6b40911aaf340c04cfdc7.tar.gz
git-d973dc01cc904ae046f6b40911aaf340c04cfdc7.tar.bz2
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
Diffstat (limited to 'git-sh-i18n.sh')
-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 d5fae99..6a27f68 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"