kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2016-10-26 13:14:46 -07:00
parent 03513c8990 3bb464437e
commit caabffaf37
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t1512-rev-parse-disambiguation.sh
View File

@ -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' '