summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-10-12 12:25:33 +0000
committerJunio C Hamano <gitster@pobox.com>2016-10-12 10:39:01 -0700
commit3bb464437e90fab11c9a5208c80a811d86b3956e (patch)
treea17f5f0c71b20bfad53f6f86db8f95933f6af0c6
parent5b33cb1fd733f581da07ae8afa7e9547eafd248e (diff)
downloadgit-jk/ambiguous-short-object-names.tar.gz
t1512: become resilient to GETTEXT_POISON buildjk/ambiguous-short-object-names
The concerned message was marked for translation by 0c99171 ("get_short_sha1: mark ambiguity error for translation", 2016-09-26). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 7c659eb585..711704ba5a 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -42,7 +42,7 @@ test_expect_success 'blob and tree' '
test_expect_success 'warn ambiguity when no candidate matches type hint' '
test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
- grep "short SHA1 000000000 is ambiguous" actual
+ test_i18ngrep "short SHA1 000000000 is ambiguous" actual
'
test_expect_success 'disambiguate tree-ish' '