t2000: modernize path checks to use helper functions

alibaba0010 · alibaba0010 · commit 5f612a95320e · 2026-03-26T05:09:45.000+01:00
Replace bare 'test -f/-d' and 'test ! -h ... &amp;&amp; test -f/-d'
assertions with their dedicated test_path_is_* helpers:

  - 'test -f path0 &amp;&amp; test -d path1 &amp;&amp; test -f path1/file1'
    becomes individual test_path_is_file/test_path_is_dir calls.

  - 'test ! -h &lt;path&gt; &amp;&amp; test -d/-f &lt;path&gt;' patterns become
    test_path_is_dir_not_symlink/test_path_is_file_not_symlink calls.

These helpers produce clearer diagnostic output on failure
(e.g. 'File path0 doesn't exist') rather than a bare exit code,
making test failures easier to debug.

Found via:

  git grep 'test -[efd]' t/

CC: Christian Couder &lt;christian.couder@gmail.com&gt;
CC: Karthik Nayak &lt;karthik.188@gmail.com&gt;
CC: Justin Tobler &lt;jltobler@gmail.com&gt;
CC: Siddharth Asthana &lt;siddharthasthana31@gmail.com&gt;
CC: Ayush Chandekar &lt;ayu.chandekar@gmail.com&gt;
Signed-off-by: alibaba0010 &lt;zakariyahali100@gmail.com&gt;
diff --git a/t/t2000-conflict-when-checking-files-out.sh b/t/t2000-conflict-when-checking-files-out.sh
@@ -58,7 +58,9 @@ test_expect_success \
 
 test_expect_success \
     'git checkout-index conflicting paths.' \
-    'test -f path0 && test -d path1 && test -f path1/file1'
+    'test_path_is_file path0 &&
+     test_path_is_dir path1 &&
+     test_path_is_file path1/file1'
 
 test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '
 	mkdir -p tar/get &&
@@ -127,9 +129,9 @@ test_debug 'show_files $tree2'
 
 test_expect_success \
     'checking out conflicting path with -f' \
-    'test ! -h path2 && test -d path2 &&
-     test ! -h path3 && test -d path3 &&
-     test ! -h path2/file0 && test -f path2/file0 &&
-     test ! -h path3/file1 && test -f path3/file1'
+    'test_path_is_dir_not_symlink path2 &&
+     test_path_is_dir_not_symlink path3 &&
+     test_path_is_file_not_symlink path2/file0 &&
+     test_path_is_file_not_symlink path3/file1'
 
 test_done
