Merge branch 'en/t7518-unflake'

gitster · gitster · commit 678c787c00d8 · 2020-10-30T13:04:23.000-07:00
Work around flakiness in a test.

* en/t7518-unflake:
  t7518: fix flaky grep invocation
diff --git 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
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ test_expect_success 'empty name and missing email' '`
`13`	`13`	`sane_unset GIT_AUTHOR_EMAIL &&`
`14`	`14`	`GIT_AUTHOR_NAME= &&`
`15`	`15`	`test_must_fail git commit --allow-empty -m foo 2>err &&`
`16`		`- test_i18ngrep ! null err`
	`16`	`+ test_i18ngrep ! "(null)" err`
`17`	`17`	`)`
`18`	`18`	`'`
`19`	`19`