Merge branch 'jc/i18n-shell-script-gettext'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Mar 2012 19:36:28 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Mar 2012 19:36:28 +0000 (12:36 -0700)
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

git-sh-i18n.sh

index d5fae99..6a27f68 100644 (file)
@@ -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"