From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Nov 2018 07:24:39 +0000 (+0900)
Subject: Merge branch 'ab/dynamic-gettext-poison'
X-Git-Tag: v2.20.0-rc1~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/954932667dac15885165cdb579acbf6a774fe140?ds=inline;hp=--cc

Merge branch 'ab/dynamic-gettext-poison'

Our testing framework uses a special i18n "poisoned localization"
feature to find messages that ought to stay constant but are
incorrectly marked to be translated.  This feature has been made
into a runtime option (it used to be a compile-time option).

* ab/dynamic-gettext-poison:
Makefile: ease dynamic-gettext-poison transition
i18n: make GETTEXT_POISON a runtime option
---

954932667dac15885165cdb579acbf6a774fe140
diff --cc .travis.yml
index a5a82d6832,4523a2e5ec..03c8e4c613
--- a/.travis.yml
+++ b/.travis.yml
@@@ -12,9 -14,19 +12,9 @@@ compiler
    - clang
    - gcc
  
 -addons:
 -  apt:
 -    sources:
 -    - ubuntu-toolchain-r-test
 -    packages:
 -    - language-pack-is
 -    - git-svn
 -    - apache2
 -    - gcc-8
 -
  matrix:
    include:
-     - env: jobname=GETTEXT_POISON
+     - env: jobname=GIT_TEST_GETTEXT_POISON
        os: linux
        compiler:
        addons: