Merge branch 'jk/ambiguous-short-object-names'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:46 +0000 (13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:46 +0000 (13:14 -0700)
A test fixup to recently graduated topic.

* jk/ambiguous-short-object-names:
t1512: become resilient to GETTEXT_POISON build

Trivial merge