Github Patch

From

Zakariyah Ali <zakariyahali100@gmail.com>

Date

Mar 26, 2026, 00:15 UTC

Message-ID

<CAPAKoce5BeXMPtok+dni+WDTkokCAq0o4uMHGg1KZto9-UniXQ@mail.gmail.com>

From 91a3ccf496cdb61149e3c031265fe252c6c8ef3c Mon Sep 17 00:00:00 2001
From: alibaba0010 <zakariyahali100@gmail.com>
Date: Tue, 24 Mar 2026 21:04:38 +0100
Subject: [PATCH] t/t2000: modernize path checks to use test_path helpers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This modernization improves test script readability by using
Git's dedicated test helpers:
- `test -f` → `test_path_is_file`
- `test -d` → `test_path_is_dir`
- `test ! -h && test -f` →
  `test_path_is_file_not_symlink`
- `test ! -h && test -d` →
  `test_path_is_dir_not_symlink`

Found instances using:
  git grep 'test -[efd]' t/ | grep 'test -[efd].*&&'

Signed-off-by: alibaba0010 <zakariyahali100@gmail.com>
---
 t/t2000-conflict-when-checking-files-out.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/t2000-conflict-when-checking-files-out.sh b/t/t2000-conflict-when-checking-files-out.sh
index f18616ad2b..b535bb002a 100755
--- a/t/t2000-conflict-when-checking-files-out.sh
+++ b/t/t2000-conflict-when-checking-files-out.sh
@@ -58,7 +58,7 @@ 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 +127,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

-- 
2.43.0