git-svn: un-break "git svn rebase" when log.abbrevCommit=true

[git.git] / git-sh-i18n.sh

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 6648bd3726f18c95de5737663fae652cadac0003..d5fae993b0c093bdd07079101df303c2c74deae3 100644 (file)
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -18,7 +18,10 @@ export TEXTDOMAINDIR
 
 # First decide what scheme to use...
 GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+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"
 then
        : no probing necessary
 elif test -n "$GIT_GETTEXT_POISON"