Merge branch 'ds/sparse-add'

gitster · gitster · commit a56d361f66a7 · 2020-03-11T10:58:16.000-07:00
Test fix.

* ds/sparse-add:
  t1091: don't grep for `strerror()` string
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
@@ -305,7 +305,7 @@ test_expect_success 'fail when lock is taken' '
 	test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
 	touch repo/.git/info/sparse-checkout.lock &&
 	test_must_fail git -C repo sparse-checkout set deep 2>err &&
-	test_i18ngrep "File exists" err
+	test_i18ngrep "Unable to create .*\.lock" err
 '
 
 test_expect_success '.gitignore should not warn about cone mode' '

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ test_expect_success 'fail when lock is taken' '`
`305`	`305`	`test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&`
`306`	`306`	`touch repo/.git/info/sparse-checkout.lock &&`
`307`	`307`	`test_must_fail git -C repo sparse-checkout set deep 2>err &&`
`308`		`- test_i18ngrep "File exists" err`
	`308`	`+ test_i18ngrep "Unable to create .*\.lock" err`
`309`	`309`	`'`
`310`	`310`
`311`	`311`	`test_expect_success '.gitignore should not warn about cone mode' '`