Revert "Merge branch 'hn/refs-test-cleanup' into next"

This reverts commit dd3af04,
reversing changes made to 689316a,
to replace the topic with a newer iteration.

Author: gitster

t/t1405-main-ref-store.sh

@@ -9,12 +9,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 RUN="test-tool ref-store main"
 
-
-test_expect_success 'setup' '
-	test_commit one
-'
-
-test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
+test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
+	test_commit one &&
 	N=`find .git/refs -type f | wc -l` &&
 	test "$N" != 0 &&
 	$RUN pack-refs 3 &&
@@ -102,12 +98,12 @@ test_expect_success 'reflog_exists(HEAD)' '
 
 test_expect_success 'delete_reflog(HEAD)' '
 	$RUN delete-reflog HEAD &&
-	test_must_fail git reflog exists HEAD
+	! test -f .git/logs/HEAD
 '
 
 test_expect_success 'create-reflog(HEAD)' '
 	$RUN create-reflog HEAD 1 &&
-	git reflog exists HEAD
+	test -f .git/logs/HEAD
 '
 
 test_expect_success 'delete_ref(refs/heads/foo)' '

t/t1410-reflog.sh

@@ -374,9 +374,7 @@ test_expect_failure 'reflog with non-commit entries displays all entries' '
 	test_line_count = 3 actual
 '
 
-# This test takes a lock on an individual ref; this is not supported in
-# reftable.
-test_expect_success REFFILES 'reflog expire operates on symref not referrent' '
+test_expect_success 'reflog expire operates on symref not referrent' '
 	git branch --create-reflog the_symref &&
 	git branch --create-reflog referrent &&
 	git update-ref referrent HEAD &&

t/t6001-rev-list-graft.sh

@@ -23,8 +23,7 @@ test_expect_success setup '
 	git commit -a -m "Third in one history." &&
 	A2=$(git rev-parse --verify HEAD) &&
 
-	git update-ref -d refs/heads/main &&
-	rm -f .git/index &&
+	rm -f .git/refs/heads/main .git/index &&
 
 	echo >fileA fileA again &&
 	echo >subdir/fileB fileB again &&

t/t6500-gc.sh

@@ -241,7 +241,7 @@ test_expect_success 'background auto gc respects lock for all operations' '
 
 	# create a ref whose loose presence we can use to detect a pack-refs run
 	git update-ref refs/heads/should-be-loose HEAD &&
-	(ls -1 .git/refs/heads .git/reftable >expect || true) &&
+	test_path_is_file .git/refs/heads/should-be-loose &&
 
 	# now fake a concurrent gc that holds the lock; we can use our
 	# shell pid so that it looks valid.
@@ -258,8 +258,7 @@ test_expect_success 'background auto gc respects lock for all operations' '
 
 	# our gc should exit zero without doing anything
 	run_and_wait_for_auto_gc &&
-	(ls -1 .git/refs/heads .git/reftable >actual || true) &&
-	test_cmp expect actual
+	test_path_is_file .git/refs/heads/should-be-loose
 '
 
 # DO NOT leave a detached auto gc process running near the end of the

t/t7064-wtstatus-pv2.sh

@@ -373,7 +373,10 @@ test_expect_success 'verify upstream fields in branch header' '
 
 		## Test upstream-gone case. Fake this by pointing
 		## origin/initial-branch at a non-existing commit.
-		git update-ref -d refs/remotes/origin/initial-branch &&
+		OLD=$(git rev-parse origin/initial-branch) &&
+		NEW=$ZERO_OID &&
+		mv .git/packed-refs .git/old-packed-refs &&
+		sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
 
 		HUF=$(git rev-parse HEAD) &&