patch, 2 partsminor GETTEXT_POISON fixes

I set NO_GETTEXT=1 in my config.mak, and happened to notice that running the tests with GETTEXT_POISON fails. I think this has been broken for years, but I don't generally play with GETTEXT_POISON. ;)

  [1/2]: t0205: drop redundant test
  [2/2]: git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME

 git-sh-i18n.sh            | 8 ++++----
 t/t0205-gettext-poison.sh | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

-Peff

We check that a shell variable is non-empty, and then we check that it's equal to a particular value. Just checking the latter covers both cases.

I suspect the original was trying to give better output when the test fails, but using "-x" covers that these days.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t0205-gettext-poison.sh | 4 ----
 1 file changed, 4 deletions(-)

Running "make NO_GETTEXT=1 GETTEXT_POISON=1" currently fails t0205.

While it might seem nonsensical at first glance to both poison and disable gettext, it's useful to be able to do a poison test-run on a system that doesn't have gettext at all. And it works fine for C programs; the problem is only with the shell code.

The issue is that we check the baked-in USE_GETTEXT_SCHEME value before GETTEXT_POISON. And when NO_GETTEXT is set, the Makefile sets USE_GETTEXT_SCHEME to "fallthrough".

So one fix would be to have the Makefile just set USE_GETTEXT_SCHEME to "poison" if GETTEXT_POISON is set. But there are two problems with that:

  1. USE_GETTEXT_SCHEME is actually a user-facing knob, so
     conceivably somebody could override it with:

       make USE_GETTEXT_SCHEME=gnu GETTEXT_POISON=1

     which would do the wrong thing (though that's much less
     likely than them having the variable set in their
     config.mak and just overriding GETTEXT_POISON on the
     command-line for a one-off test).

  2. We don't actually bake GETTEXT_POISON in to the shell
     library like we do for the C code. It checks
     $GIT_GETTEXT_POISON at runtime, which is set up by the
     test suite. So it makes sense to put the fix in the
     runtime code, too, which would cover something like:

       GIT_GETTEXT_POISON=foo git foo

     It's not likely that people use the poison code outside
     of running the test suite, but it's easy enough to make
     this case work.

Signed-off-by: Jeff King <peff@peff.net>
---
 git-sh-i18n.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

On Travis we run GETTEXT_POISON with gettext installed. What do you think about an additional job with GETTEXT_POISON and NO_GETTEXT=1?

- Lars

On Tue, Feb 06, 2018 at 10:06:53AM +0100, Lars Schneider wrote:

I think it's probably a waste of CPU. ;)

It would be running the whole test suite to fix this one particular bug, which I don't think is pretty likely to regress (at least not more than any other bug). Whereas running with GETTEXT_POISON is meant to shake out strings that maybe shouldn't be translated, which is a very likely bug to get introduced.

-Peff