[PATCH 2/2] Second batch of shell test migrations.

@@ -9,7 +9,7 @@ test_perf_large_repo
 test_expect_success 'repack' '
 	git repack -ad &&
 	PACK=$(ls .git/objects/pack/*.pack | head -n1) &&
-	test -f "$PACK" &&
+	test_path_is_file "$PACK" &&
 	export PACK
 '
 

@@ -156,7 +156,7 @@ test_expect_success POSIXPERM 'GIT_SHELL_PATH points to a valid executable' '
 test_expect_success MINGW 'GIT_SHELL_PATH points to a suitable shell' '
 	shellpath=$(git var GIT_SHELL_PATH) &&
 	case "$shellpath" in
-	[A-Z]:/*/sh.exe) test -f "$shellpath";;
+	[A-Z]:/*/sh.exe) test_path_is_file "$shellpath";;
 	*) return 1;;
 	esac
 '

@@ -32,7 +32,7 @@ test_expect_success 'repack everything into a single packfile' '
 		".git/objects/pack/pack-"*".pack") true ;;
 		*) false ;;
 	esac &&
-	test -f "$head_commit_pack" &&
+	test_path_is_file "$head_commit_pack" &&
 
 	# Everything is in the same pack
 	test "$head_commit_pack" = "$head_tree_pack" &&

@@ -460,7 +460,7 @@ test_expect_success POSIXPERM,SANITY 'graceful handling when splitting index is
 		cd ro &&
 		test_commit initial &&
 		git update-index --split-index &&
-		test -f .git/sharedindex.*
+		test_path_is_file .git/sharedindex.*
 	) &&
 	cp ro/.git/index new-index &&
 	test_when_finished "chmod u+w ro/.git" &&

@@ -19,7 +19,7 @@ echo "120000 $l	symlink" | git update-index --index-info'
 test_expect_success \
 'the checked-out symlink must be a file' '
 git checkout-index symlink &&
-test -f symlink'
+test_path_is_file symlink'
 
 test_expect_success 'the file must be the blob we added during the setup' '
 	echo "$l" >expect &&

@@ -75,7 +75,7 @@ test_rebase_continue_update_encode () {
 		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
 		git config i18n.commitencoding $new &&
 		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
+		test_path_is_file .git/rebase-merge/message &&
 		git stripspace -s <.git/rebase-merge/message >two.t &&
 		git add two.t &&
 		git rebase --continue &&

@@ -14,7 +14,7 @@ DQ='"'
 
 test_have_prereq MINGW ||
 echo foo 2>/dev/null > "Name and an${HT}HT"
-if ! test -f "Name and an${HT}HT"
+if test_path_is_missing "Name and an${HT}HT"
 then
 	# FAT/NTFS does not allow tabs in filenames
 	skip_all='Your filesystem does not allow tabs in filenames'

@@ -235,7 +235,7 @@ do
 			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
 			echo "\$"
 		} >"$actual" &&
-		if test -f "$expect"
+		if test_path_is_file "$expect"
 		then
 			process_diffs "$actual" >actual &&
 			process_diffs "$expect" >expect &&

@@ -14,7 +14,7 @@ P2='pathname with SP'
 P3='pathname
 with LF'
 test_have_prereq !MINGW &&
-echo 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1" || {
+echo 2>/dev/null >"$P1" && test_path_is_file "$P1" && rm -f "$P1" || {
 	skip_all='Your filesystem does not allow tabs in filenames'
 	test_done
 }

@@ -64,7 +64,7 @@ test_expect_success 'apply to a funny path' '
 	rm -fr .git/rebase-apply &&
 	git reset --hard initial &&
 	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
-	test -f "$with_sq/file-5"
+	test_path_is_file "$with_sq/file-5"
 '
 
 test_expect_success 'am --reject' '

@@ -34,7 +34,7 @@ test_lazy_prereq TAR_NEEDS_PAX_FALLBACK '
 		mkdir pax &&
 		cd pax &&
 		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
-		test -f PaxHeaders.1791/file
+		test_path_is_file PaxHeaders.1791/file
 	)
 '
 

@@ -34,15 +34,15 @@ do
 
 	test_expect_success $prereq "mailinfo $mail" '
 		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
+		if test_path_is_file "$DATA/msg$mail--scissors"
 		then
 			check_mailinfo "$mail" --scissors
 		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
+		if test_path_is_file "$DATA/msg$mail--no-inbody-headers"
 		then
 			check_mailinfo "$mail" --no-inbody-headers
 		fi &&
-		if test -f "$DATA/msg$mail--message-id"
+		if test_path_is_file "$DATA/msg$mail--message-id"
 		then
 			check_mailinfo "$mail" --message-id
 		fi

@@ -47,7 +47,7 @@ compare_results_with_midx 'non-incremental MIDX conversion'
 
 write_midx_layer () {
 	n=1
-	if test -f $midx_chain
+	if test_path_is_file $midx_chain
 	then
 		n="$(($(wc -l <$midx_chain) + 1))"
 	fi

@@ -37,7 +37,7 @@ test_expect_success 'setup clone hooks' '
 
 test_expect_success 'post-merge does not run for up-to-date ' '
 	GIT_DIR=clone1/.git git merge $commit0 &&
-	! test -f clone1/.git/post-merge.args
+	test_path_is_missing clone1/.git/post-merge.args
 '
 
 test_expect_success 'post-merge runs as expected ' '

@@ -317,7 +317,7 @@ test_expect_success 'turn shallow to complete repository' '
 		cd shallow &&
 		GIT_TRACE2_EVENT="$(pwd)/trace2_event" \
 			git fetch --unshallow &&
-		! test -f .git/shallow &&
+		test_path_is_missing .git/shallow &&
 		git fsck --full &&
 		test_grep \"fetch-info\".*\"shallows\":2 trace2_event &&
 		test_grep \"fetch-info\".*\"depth\":2147483647 trace2_event

@@ -208,7 +208,7 @@ do
 			cat .git/FETCH_HEAD
 		} >"$actual_f" &&
 		git show-ref >"$actual_r" &&
-		if test -f "expect_f"
+		if test_path_is_file "expect_f"
 		then
 			test_cmp "expect_f" "$actual_f" &&
 			rm -f "$actual_f"

@@ -217,7 +217,7 @@ do
 			cp "$actual_f" "$expect_f"
 			false
 		fi &&
-		if test -f "expect_r"
+		if test_path_is_file "expect_r"
 		then
 			test_cmp "expect_r" "$actual_r" &&
 			rm -f "$actual_r"

@@ -106,19 +106,19 @@ add_superproject_commits () {
 verify_fetch_result () {
 	ACTUAL_ERR=$1 &&
 	rm -f expect.err.combined &&
-	if test -f expect.err.super
+	if test_path_is_file expect.err.super
 	then
 		cat expect.err.super >>expect.err.combined
 	fi &&
-	if test -f expect.err.sub
+	if test_path_is_file expect.err.sub
 	then
 		cat expect.err.sub >>expect.err.combined
 	fi &&
-	if test -f expect.err.deep
+	if test_path_is_file expect.err.deep
 	then
 		cat expect.err.deep >>expect.err.combined
 	fi &&
-	if test -f expect.err.sub2
+	if test_path_is_file expect.err.sub2
 	then
 		cat expect.err.sub2 >>expect.err.combined
 	fi &&

@@ -57,7 +57,7 @@ test_expect_success 'clone does not keep pack' '
 
 	rm -fr dst &&
 	git clone -n "file://$(pwd)/src" dst &&
-	! test -f dst/file &&
+	test_path_is_missing dst/file &&
 	! (echo dst/.git/objects/pack/pack-* | grep "\.keep")
 
 '

@@ -66,15 +66,15 @@ test_expect_success 'clone checks out files' '
 
 	rm -fr dst &&
 	git clone src dst &&
-	test -f dst/file
+	test_path_is_file dst/file
 
 '
 
 test_expect_success 'clone respects GIT_WORK_TREE' '
 
 	GIT_WORK_TREE=worktree git clone src bare &&
-	test -f bare/config &&
-	test -f worktree/file
+	test_path_is_file bare/config &&
+	test_path_is_file worktree/file
 
 '
 

@@ -102,22 +102,22 @@ test_expect_success 'clone from hooks' '
 test_expect_success 'clone creates intermediate directories' '
 
 	git clone src long/path/to/dst &&
-	test -f long/path/to/dst/file
+	test_path_is_file long/path/to/dst/file
 
 '
 
 test_expect_success 'clone creates intermediate directories for bare repo' '
 
 	git clone --bare src long/path/to/bare/dst &&
-	test -f long/path/to/bare/dst/config
+	test_path_is_file long/path/to/bare/dst/config
 
 '
 
 test_expect_success 'clone --mirror' '
 
 	git clone --mirror src mirror &&
-	test -f mirror/HEAD &&
-	test ! -f mirror/file &&
+	test_path_is_file mirror/HEAD &&
+	test_path_is_missing mirror/file &&
 	FETCH="$(cd mirror && git config remote.origin.fetch)" &&
 	test "+refs/*:refs/*" = "$FETCH" &&
 	MIRROR="$(cd mirror && git config --bool remote.origin.mirror)" &&

@@ -1261,8 +1261,8 @@ test_expect_success 'part of packfile response provided as URI' '
 			fi
 		fi || return 1
 	done &&
-	test -f hfound &&
-	test -f h2found &&
+	test_path_is_file hfound &&
+	test_path_is_file h2found &&
 
 	# Ensure that there are exactly 3 packfiles with associated .idx
 	ls http_child/.git/objects/pack/*.pack \

@@ -41,7 +41,7 @@ check_missing_objects () {
 	then
 		test "$3" = "$(cat missing.txt)"
 	else
-		test -f "$3" &&
+		test_path_is_file "$3" &&
 		sort <"$3" >expected_sorted &&
 		sort <missing.txt >actual_sorted &&
 		test_cmp expected_sorted actual_sorted

@@ -851,7 +851,7 @@ test_expect_success 'optimized merge base checks' '
 	test_grep "merge base must be tested" my_bisect_log.txt &&
 	test_grep "$HASH4" my_bisect_log.txt &&
 	git bisect good > my_bisect_log2.txt &&
-	test -f ".git/BISECT_ANCESTORS_OK" &&
+	test_path_is_file ".git/BISECT_ANCESTORS_OK" &&
 	test "$HASH6" = $(git rev-parse --verify HEAD) &&
 	git bisect bad &&
 	git bisect good "$A_HASH" > my_bisect_log4.txt &&

@@ -538,7 +538,7 @@ test_expect_success 'creating an annotated tag with -F - should succeed' '
 '
 
 test_expect_success 'trying to create a tag with a non-existing -F file should fail' '
-	! test -f nonexistingfile &&
+	test_path_is_missing nonexistingfile &&
 	! tag_exists notag &&
 	test_must_fail git tag -F nonexistingfile notag &&
 	! tag_exists notag

@@ -1099,7 +1099,7 @@ test_expect_success GPG 'git tag --no-sign configured tag.gpgsign skip GPG sign'
 '
 
 test_expect_success GPG 'trying to create a signed tag with non-existing -F file should fail' '
-	! test -f nonexistingfile &&
+	test_path_is_missing nonexistingfile &&
 	! tag_exists nosigtag &&
 	test_must_fail git tag -s -F nonexistingfile nosigtag &&
 	! tag_exists nosigtag

@@ -24,7 +24,7 @@ H sub/2
 EOF
 
 setup_absent() {
-	test -f 1 && rm 1
+	test_path_is_file 1 && rm 1
 	git update-index --remove 1 &&
 	git update-index --add --cacheinfo 100644 $EMPTY_BLOB 1 &&
 	git update-index --skip-worktree 1

@@ -84,7 +84,7 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
 		git config core.worktree .. &&
 		git pull &&
 		git submodule update --init &&
-		test -f .vim/bundle/dupe/shoot.t
+		test_path_is_file .vim/bundle/dupe/shoot.t
 	)
 '
 

@@ -320,7 +320,7 @@ test_expect_success WINDOWS 'prevent git~1 squatting on Windows' '
 		# git~2 is an 8.3 short name, present only when 8.3 name
 		# generation is enabled. The "directory not empty" check
 		# above is the primary assertion.
-		if test -f squatting-clone/d/a/git~2
+		if test_path_is_file squatting-clone/d/a/git~2
 		then
 			test_grep ! gitdir squatting-clone/d/a/git~2
 		fi

@@ -409,8 +409,8 @@ test_expect_success SYMLINKS,!WINDOWS,!MINGW 'submodule must not checkout into d
 	git -C repo commit -m submodule &&
 
 	git -c protocol.file.allow=always clone --recurse-submodules repo bad-clone &&
-	! test -f "$PWD/bad-clone/sub/foo" &&
-	test -f $(printf "bad-clone/sub\r/post-checkout")
+	test_path_is_missing "$PWD/bad-clone/sub/foo" &&
+	test_path_is_file $(printf "bad-clone/sub\r/post-checkout")
 '
 
 test_done

@@ -59,9 +59,9 @@ test_expect_success 'merge c2 with a custom strategy' '
 	test_cmp head.old first-parent &&
 	test_cmp second-parent.expected second-parent &&
 	test_cmp tree.expected tree &&
-	test -f c0.c &&
+	test_path_is_file c0.c &&
 	test_grep c1c1 c1.c &&
-	test -f c2.c
+	test_path_is_file c2.c
 '
 
 test_expect_success 'trivial merge with custom strategy' '

@@ -85,9 +85,9 @@ test_expect_success 'trivial merge with custom strategy' '
 	test_cmp head.old first-parent &&
 	test_cmp second-parent.expected second-parent &&
 	test_cmp tree.expected tree &&
-	test -f c0.c &&
+	test_path_is_file c0.c &&
 	! test -e c1.c &&
-	test -f c3.c
+	test_path_is_file c3.c
 '
 
 test_done

@@ -382,15 +382,15 @@ test_expect_success 'mergetool delete/delete conflict' '
 	git checkout -b test$test_count move-to-c &&
 	test_must_fail git merge move-to-b &&
 	echo d | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt &&
+	test_path_is_missing a/a/file.txt &&
 	git reset --hard &&
 	test_must_fail git merge move-to-b &&
 	echo m | git mergetool a/a/file.txt &&
-	test -f b/b/file.txt &&
+	test_path_is_file b/b/file.txt &&
 	git reset --hard &&
 	test_must_fail git merge move-to-b &&
 	! echo a | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt
+	test_path_is_missing a/a/file.txt
 '
 
 test_expect_success 'mergetool produces no errors when keepBackup is used' '

@@ -26,7 +26,7 @@ test_expect_success $PREREQ 'Setup helper tool' '
 	write_script fake.sendmail <<-\EOF &&
 	shift
 	output=1
-	while test_path_is_file commandline$output
+	while test -f commandline$output
 	do
 		output=$(($output+1))
 	done

@@ -66,7 +66,7 @@ test_no_confirm () {
 
 # Exit immediately to prevent hang if a no-confirm test fails
 check_no_confirm () {
-	if test_path_is_missing no_confirm_okay
+	if ! test -f no_confirm_okay
 	then
 		say 'confirm test failed; skipping remaining tests to prevent hanging'
 		PREREQ="$PREREQ,CHECK_NO_CONFIRM"

@@ -2722,7 +2722,7 @@ test_expect_success $PREREQ 'invoke hook' '
 		false
 		;;
 	esac &&
-	test_path_is_file 0001-add-main.patch &&
+	test -f 0001-add-main.patch &&
 	grep "add main" "$1"
 	EOF
 

@@ -59,9 +59,9 @@ test_expect_success 'basic p4 labels' '
 
 		cd main &&
 		git checkout tag_tag_f1_only &&
-		! test -f f2 &&
+		test_path_is_missing f2 &&
 		git checkout tag_tag_with\$_shell_char &&
-		test -f f1 && test -f f2 && test -f file_with_\$metachar &&
+		test_path_is_file f1 && test_path_is_file f2 && test_path_is_file file_with_\$metachar &&
 
 		git show tag_long_label | grep -q "A Label second line"
 	)

@@ -100,11 +100,11 @@ test_expect_failure 'two labels on the same changelist' '
 
 		git checkout tag_tag_f1_1 &&
 		ls &&
-		test -f f1 &&
+		test_path_is_file f1 &&
 
 		git checkout tag_tag_f1_2 &&
 		ls &&
-		test -f f1
+		test_path_is_file f1
 	)
 '