Merge branch 'jc/no-grepping-for-strerror-in-tests'

gitster · gitster · commit 4e09a7b54009 · 2019-02-14T14:28:21.000-08:00
* jc/no-grepping-for-strerror-in-tests:
  t1404: do not rely on the exact phrasing of strerror()
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
@@ -614,7 +614,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '
 	test_when_finished "rm -f .git/packed-refs.lock" &&
 	test_must_fail git update-ref -d $prefix/foo >out 2>err &&
 	git for-each-ref $prefix >actual &&
-	test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
+	test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: " err &&
 	test_cmp unchanged actual
 '
 

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '`
`614`	`614`	`test_when_finished "rm -f .git/packed-refs.lock" &&`
`615`	`615`	`test_must_fail git update-ref -d $prefix/foo >out 2>err &&`
`616`	`616`	`git for-each-ref $prefix >actual &&`
`617`		`- test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&`
	`617`	`+ test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: " err &&`
`618`	`618`	`test_cmp unchanged actual`
`619`	`619`	`'`
`620`	`620`