Merge branch 'rc/t1001-test-path-is-file' into next

gitster · gitster · commit bc67be09c3da · 2025-05-13T14:07:09.000-07:00
Test update.

* rc/t1001-test-path-is-file:
  t1001: replace 'test -f' with 'test_path_is_file'
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
@@ -362,7 +362,7 @@ test_expect_success 'a/b (untracked) vs a case setup.' '
 test_expect_success 'a/b (untracked) vs a, plus c/d case test.' '
 	read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
 	git ls-files --stage &&
-	test -f a/b
+	test_path_is_file a/b
 '
 
 test_expect_success 'read-tree supports the super-prefix' '

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ test_expect_success 'a/b (untracked) vs a case setup.' '`
`362`	`362`	`test_expect_success 'a/b (untracked) vs a, plus c/d case test.' '`
`363`	`363`	`read_tree_u_must_fail -u -m "$treeH" "$treeM" &&`
`364`	`364`	`git ls-files --stage &&`
`365`		`- test -f a/b`
	`365`	`+ test_path_is_file a/b`
`366`	`366`	`'`
`367`	`367`
`368`	`368`	`test_expect_success 'read-tree supports the super-prefix' '`