Merge branch 'mb/t7110-use-test-path-helper' into seen

* mb/t7110-use-test-path-helper: t7110: replace `test -f` with `test_path_is_*` helpers
gitgitgadget · Jan 3, 2025 · d099395 · d099395
2 parents 5411572 + 866ea87
commit d099395
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
@@ -270,22 +270,22 @@ test_expect_success '--merge is ok with added/deleted merge' '
 	git reset --hard third &&
 	rm -f file2 &&
 	test_must_fail git merge branch3 &&
-	! test -f file2 &&
-	test -f file3 &&
+	test_path_is_missing file2 &&
+	test_path_is_file file3 &&
 	git diff --exit-code file3 &&
 	git diff --exit-code branch3 file3 &&
 	git reset --merge HEAD &&
-	! test -f file3 &&
-	! test -f file2 &&
+	test_path_is_missing file3 &&
+	test_path_is_missing file2 &&
 	git diff --exit-code --cached
 '
 
 test_expect_success '--keep fails with added/deleted merge' '
 	git reset --hard third &&
 	rm -f file2 &&
 	test_must_fail git merge branch3 &&
-	! test -f file2 &&
-	test -f file3 &&
+	test_path_is_missing file2 &&
+	test_path_is_file file3 &&
 	git diff --exit-code file3 &&
 	git diff --exit-code branch3 file3 &&
 	test_must_fail git reset --keep HEAD 2>err.log &&