diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-30 13:04:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-30 13:04:23 -0700 |
| commit | 678c787c00d88d06b7dd7335f9341b3164b009f9 (patch) | |
| tree | 10a884511dd2a8c29f57aee1d7ce9d58d24b475e | |
| parent | Sync with Git 2.29.2 (diff) | |
| parent | t7518: fix flaky grep invocation (diff) | |
| download | tgif-678c787c00d88d06b7dd7335f9341b3164b009f9.tar.xz | |
Merge branch 'en/t7518-unflake'
Work around flakiness in a test.
* en/t7518-unflake:
t7518: fix flaky grep invocation
| -rwxr-xr-x | t/t7518-ident-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh index dc3e9c8c88..905957bd0a 100755 --- a/t/t7518-ident-corner-cases.sh +++ b/t/t7518-ident-corner-cases.sh @@ -13,7 +13,7 @@ test_expect_success 'empty name and missing email' ' sane_unset GIT_AUTHOR_EMAIL && GIT_AUTHOR_NAME= && test_must_fail git commit --allow-empty -m foo 2>err && - test_i18ngrep ! null err + test_i18ngrep ! "(null)" err ) ' |