Merge branch 'en/t7518-unflake' into jch

Work around flakiness in a test.

* en/t7518-unflake:
  t7518: fix flaky grep invocation

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