From: Zakariyah Ali Date: Thu, 26 Mar 2026 19:26:03 GMT Subject: [GSoC PATCH v2] t2000: modernize path checks with test_path_is_* helpers Message-ID: <20260326192603.23961-1-zakariyahali100@gmail.com> In-Reply-To: Replace bare 'test -f/-d' and 'test ! -h' assertions with dedicated helpers. These helpers report loudly what expectation wasn't met, therefore making debugging easier. Signed-off-by: Zakariyah Ali --- t/t2000-conflict-when-checking-files-out.sh | 12 +++++++----- 1 file changed, 7 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..96bae6c53d 100755 --- 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 -- 2.43.0