From 01d15bccf3b1dcc51516b1f64d50950b31d7f8fb Mon Sep 17 00:00:00 2001
From: Runxi Yu
Date: Fri, 6 Mar 2026 21:19:56 +0800
Subject: Urgh I made some wrong amends and I'm too tired to separate the
 commits out this time

ancestor: Split out of reachability
mergebase: Add merge base routines
internal/commitquery: Add commit query context engine thingy
internal/peel: Shared tag peeling
errors: Shared object query errors
internal/testgit: Add rooted repo helpers; remove raw path access
objectstore/memory: Add in-memory object store
objectid: Add Compare helper
---
 refstore/packed/packed_test.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'refstore/packed')

diff --git a/refstore/packed/packed_test.go b/refstore/packed/packed_test.go
index 9d6b2fe1..e5a56dda 100644
--- a/refstore/packed/packed_test.go
+++ b/refstore/packed/packed_test.go
@@ -14,15 +14,10 @@ import (
 	"codeberg.org/lindenii/furgit/refstore/packed"
 )
 
-func openPackedRefStoreFromRepo(t *testing.T, repoPath string, algo objectid.Algorithm) *packed.Store {
+func openPackedRefStoreFromRepo(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *packed.Store {
 	t.Helper()
 
-	root, err := os.OpenRoot(repoPath)
-	if err != nil {
-		t.Fatalf("OpenRoot(repo): %v", err)
-	}
-
-	defer func() { _ = root.Close() }()
+	root := testRepo.OpenGitRoot(t)
 
 	store, err := packed.New(root, algo)
 	if err != nil {
@@ -37,11 +32,6 @@ func openPackedRefStoreFromContent(t *testing.T, content string, algo objectid.A
 
 	dir := t.TempDir()
 
-	err := os.WriteFile(dir+"/packed-refs", []byte(content), 0o644)
-	if err != nil {
-		t.Fatalf("WriteFile(packed-refs): %v", err)
-	}
-
 	root, err := os.OpenRoot(dir)
 	if err != nil {
 		t.Fatalf("OpenRoot(temp): %v", err)
@@ -49,6 +39,11 @@ func openPackedRefStoreFromContent(t *testing.T, content string, algo objectid.A
 
 	defer func() { _ = root.Close() }()
 
+	err = root.WriteFile("packed-refs", []byte(content), 0o644)
+	if err != nil {
+		t.Fatalf("WriteFile(packed-refs): %v", err)
+	}
+
 	return packed.New(root, algo)
 }
 
@@ -61,7 +56,7 @@ func TestPackedResolveAndPeeled(t *testing.T) {
 		tagID := testRepo.TagAnnotated(t, "v1.0.0", commitID, "annotated tag")
 		testRepo.PackRefs(t, "--all", "--prune")
 
-		store := openPackedRefStoreFromRepo(t, testRepo.Dir(), algo)
+		store := openPackedRefStoreFromRepo(t, testRepo, algo)
 
 		resolvedMain, err := store.Resolve("refs/heads/main")
 		if err != nil {
@@ -125,7 +120,7 @@ func TestPackedListAndShorten(t *testing.T) {
 		testRepo.UpdateRef(t, "refs/remotes/origin/main", commitID)
 		testRepo.PackRefs(t, "--all", "--prune")
 
-		store := openPackedRefStoreFromRepo(t, testRepo.Dir(), algo)
+		store := openPackedRefStoreFromRepo(t, testRepo, algo)
 
 		all, err := store.List("")
 		if err != nil {
@@ -180,7 +175,7 @@ func TestPackedListPatternMatrix(t *testing.T) {
 		testRepo.UpdateRef(t, "refs/tags/v1", commitID)
 		testRepo.PackRefs(t, "--all", "--prune")
 
-		store := openPackedRefStoreFromRepo(t, testRepo.Dir(), algo)
+		store := openPackedRefStoreFromRepo(t, testRepo, algo)
 
 		tests := []struct {
 			pattern string
-- 
cgit v1.3.1-10-gc9f91