diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:46 -0700 |
| commit | caabffaf375d0f4b9195a04e9141852229ee5aee (patch) | |
| tree | 781f5c68797cad948ded6532dd59a7b54abcb23d /t | |
| parent | 03513c89907ffffa74fd7c03b3b0e252786ecc4c (diff) | |
| parent | 3bb464437e90fab11c9a5208c80a811d86b3956e (diff) | |
| download | git-caabffaf375d0f4b9195a04e9141852229ee5aee.tar.gz git-caabffaf375d0f4b9195a04e9141852229ee5aee.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1512-rev-parse-disambiguation.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 7c659eb58..711704ba5 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' ' |