[PATCH] t1001: replace 'test -f' with 'test_path_is_file'

Rodrigo Carvalho· May 10, 2025, 23:09 UTC · lore

'test_path_is_file' is a modern path checking method in Git's development.
 Replace the basic shell command 'test -f' with this approach.

Signed-off-by: Rodrigo Carvalho <rodrigorsdc@gmail.com>
---
 t/t1001-read-tree-m-2way.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t1001-read-tree-m-2way.sh +1 −1

diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 4a88bb9ef0..2e8d9384e1 100755
--- 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' '

-- 
2.43.0

Junio C Hamano· May 12, 2025, 17:09 UTC · re: Rodrigo Carvalho · lore

Re: [PATCH] t1001: replace 'test -f' with 'test_path_is_file'

Rodrigo Carvalho <rodrigorsdc@gmail.com> writes:

Show 19 quoted lines

> 'test_path_is_file' is a modern path checking method in Git's development.
>  Replace the basic shell command 'test -f' with this approach.
>
> Signed-off-by: Rodrigo Carvalho <rodrigorsdc@gmail.com>
> ---
>  t/t1001-read-tree-m-2way.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
> index 4a88bb9ef0..2e8d9384e1 100755
> --- 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
>  '

Obviously correct conversion.

This is an ancient part of the system, started before we even had a "git checkout" rewritten as a single command, so it is not surprising if it had quite a lot of antiquities and debugging statement without much effect, which may be subject to further clean-up.

Thanks, will queue.

patcht1001: replace 'test -f' with 'test_path_is_file'