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

Merge branch 'en/t7518-unflake' 

Work around flakiness in a test.

* en/t7518-unflake:
  t7518: fix flaky grep invocation
maint
Junio C Hamano 2020-10-30 13:04:23 -07:00
parent ad27df6a5c 04b65a3bc0
commit 678c787c00
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/t7518-ident-corner-cases.sh
View File

@ -13,7 +13,7 @@ test_expect_success 'empty name and missing email' '
sane_unset GIT_AUTHOR_EMAIL && sane_unset GIT_AUTHOR_EMAIL &&
GIT_AUTHOR_NAME= && GIT_AUTHOR_NAME= &&
test_must_fail git commit --allow-empty -m foo 2>err && test_must_fail git commit --allow-empty -m foo 2>err &&
test_i18ngrep ! null err test_i18ngrep ! "(null)" err
) )
' '