Merge branch 'jk/ambiguous-short-object-names'
commitcaabffaf375d0f4b9195a04e9141852229ee5aee
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:46 +0000 (26 13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:46 +0000 (26 13:14 -0700)
tree781f5c68797cad948ded6532dd59a7b54abcb23d
parent03513c89907ffffa74fd7c03b3b0e252786ecc4c
parent3bb464437e90fab11c9a5208c80a811d86b3956e
Merge branch 'jk/ambiguous-short-object-names'

A test fixup to recently graduated topic.

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