aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--receivepack/int_test.go10
-rw-r--r--refstore/chain/resolve.go4
-rw-r--r--refstore/files/packed_delete_test.go18
-rw-r--r--refstore/files/read_resolve_fully.go2
-rw-r--r--refstore/files/resolve_list_test.go16
-rw-r--r--refstore/files/transaction_dirs_test.go4
-rw-r--r--refstore/files/transaction_pseudoref_test.go4
-rw-r--r--refstore/files/transaction_symbolic_test.go2
-rw-r--r--refstore/files/transaction_update_test.go6
-rw-r--r--refstore/files/worktree_test.go32
-rw-r--r--refstore/reading.go4
-rw-r--r--repository/refs_test.go12
12 files changed, 57 insertions, 57 deletions
diff --git a/receivepack/int_test.go b/receivepack/int_test.go
index e6d5476a..8aba0713 100644
--- a/receivepack/int_test.go
+++ b/receivepack/int_test.go
@@ -393,7 +393,7 @@ func TestReceivePackPackCreatePromotesObjectsAndUpdatesRef(t *testing.T) {
resolved, err := reopened.Refs().ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if resolved.ID != commitID {
@@ -697,7 +697,7 @@ func TestReceivePackPredefinedRejectForcePushHookRejectsNonFastForward(t *testin
resolved, err := repo.Refs().ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if resolved.ID != currentID {
@@ -788,7 +788,7 @@ func TestReceivePackGitPushCreatesBranch(t *testing.T) {
resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if resolved.ID != commitID {
@@ -838,7 +838,7 @@ func TestReceivePackGitPushRefUpdateWithoutNewObjectsSucceeds(t *testing.T) {
resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/topic")
if err != nil {
- t.Fatalf("ResolveFully(topic): %v", err)
+ t.Fatalf("ResolveToDetached(topic): %v", err)
}
if resolved.ID != commitID {
@@ -939,7 +939,7 @@ func TestReceivePackGitPushRejectsForcedUpdateViaHook(t *testing.T) {
resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if resolved.ID != currentID {
diff --git a/refstore/chain/resolve.go b/refstore/chain/resolve.go
index c9dcc501..99ada284 100644
--- a/refstore/chain/resolve.go
+++ b/refstore/chain/resolve.go
@@ -32,9 +32,9 @@ func (chain *Chain) Resolve(name string) (ref.Ref, error) {
return nil, refstore.ErrReferenceNotFound
}
-// ResolveFully resolves symbolic references through Resolve until detached.
+// ResolveToDetached resolves symbolic references through Resolve until detached.
//
-// It intentionally does not call backend ResolveFully. This allows symbolic
+// It intentionally does not call backend ResolveToDetached. This allows symbolic
// references to cross backends in the chain.
func (chain *Chain) ResolveToDetached(name string) (ref.Detached, error) {
cur := name
diff --git a/refstore/files/packed_delete_test.go b/refstore/files/packed_delete_test.go
index ed05f20b..d8209f5b 100644
--- a/refstore/files/packed_delete_test.go
+++ b/refstore/files/packed_delete_test.go
@@ -55,11 +55,11 @@ func TestFilesTransactionPackedDeleteFailureLeavesRefsUnchanged(t *testing.T) {
got, err := store.ResolveToDetached(prefix + "/foo")
if err != nil {
- t.Fatalf("ResolveFully(lock held): %v", err)
+ t.Fatalf("ResolveToDetached(lock held): %v", err)
}
if got.ID != looseID {
- t.Fatalf("ResolveFully(lock held) = %s, want %s", got.ID, looseID)
+ t.Fatalf("ResolveToDetached(lock held) = %s, want %s", got.ID, looseID)
}
gitRoot := testRepo.OpenGitRoot(t)
@@ -108,11 +108,11 @@ func TestFilesTransactionPackedDeleteFailureLeavesRefsUnchanged(t *testing.T) {
got, err := store.ResolveToDetached(prefix + "/foo")
if err != nil {
- t.Fatalf("ResolveFully(new exists): %v", err)
+ t.Fatalf("ResolveToDetached(new exists): %v", err)
}
if got.ID != looseID {
- t.Fatalf("ResolveFully(new exists) = %s, want %s", got.ID, looseID)
+ t.Fatalf("ResolveToDetached(new exists) = %s, want %s", got.ID, looseID)
}
})
})
@@ -184,11 +184,11 @@ func TestFilesPackedRefIgnoresEmptyDirectories(t *testing.T) {
got, err := store.ResolveToDetached(name)
if err != nil {
- t.Fatalf("ResolveFully: %v", err)
+ t.Fatalf("ResolveToDetached: %v", err)
}
if got.ID != commitID {
- t.Fatalf("ResolveFully = %s, want %s", got.ID, commitID)
+ t.Fatalf("ResolveToDetached = %s, want %s", got.ID, commitID)
}
actual := make([]string, 0)
@@ -206,7 +206,7 @@ func TestFilesPackedRefIgnoresEmptyDirectories(t *testing.T) {
for _, name := range actual {
refValue, resolveErr := store.ResolveToDetached(name)
if resolveErr != nil {
- t.Fatalf("ResolveFully(%q): %v", name, resolveErr)
+ t.Fatalf("ResolveToDetached(%q): %v", name, resolveErr)
}
fullActual = append(fullActual, refValue.ID.String()+" "+name)
@@ -264,11 +264,11 @@ func TestFilesDeleteWaitsForPackedRefsLockWithoutIntermediateState(t *testing.T)
got, err := store.ResolveToDetached(prefix + "/foo")
if err != nil {
- t.Fatalf("ResolveFully while lock held: %v", err)
+ t.Fatalf("ResolveToDetached while lock held: %v", err)
}
if got.ID != looseID {
- t.Fatalf("ResolveFully while lock held = %s, want %s", got.ID, looseID)
+ t.Fatalf("ResolveToDetached while lock held = %s, want %s", got.ID, looseID)
}
testRepo.Remove(t, "packed-refs.lock")
diff --git a/refstore/files/read_resolve_fully.go b/refstore/files/read_resolve_fully.go
index 6871712c..de58eb6d 100644
--- a/refstore/files/read_resolve_fully.go
+++ b/refstore/files/read_resolve_fully.go
@@ -7,7 +7,7 @@ import (
"codeberg.org/lindenii/furgit/ref"
)
-// ResolveFully resolves symbolic references through the visible files store
+// ResolveToDetached resolves symbolic references through the visible files store
// namespace until one detached reference is reached.
func (store *Store) ResolveToDetached(name string) (ref.Detached, error) {
cur := name
diff --git a/refstore/files/resolve_list_test.go b/refstore/files/resolve_list_test.go
index 41bd1ad2..82d1cc48 100644
--- a/refstore/files/resolve_list_test.go
+++ b/refstore/files/resolve_list_test.go
@@ -55,11 +55,11 @@ func TestFilesResolveAndListOverlay(t *testing.T) {
fullHead, err := store.ResolveToDetached("HEAD")
if err != nil {
- t.Fatalf("ResolveFully(HEAD): %v", err)
+ t.Fatalf("ResolveToDetached(HEAD): %v", err)
}
if fullHead.ID != looseID {
- t.Fatalf("ResolveFully(HEAD) = %s, want %s", fullHead.ID, looseID)
+ t.Fatalf("ResolveToDetached(HEAD) = %s, want %s", fullHead.ID, looseID)
}
allRefs, err := store.List("")
@@ -98,20 +98,20 @@ func TestFilesLooseRefParsingMatchesGit(t *testing.T) {
got, err := store.ResolveToDetached("refs/heads/no-lf")
if err != nil {
- t.Fatalf("ResolveFully(no-lf): %v", err)
+ t.Fatalf("ResolveToDetached(no-lf): %v", err)
}
if got.ID != oid {
- t.Fatalf("ResolveFully(no-lf) = %s, want %s", got.ID, oid)
+ t.Fatalf("ResolveToDetached(no-lf) = %s, want %s", got.ID, oid)
}
got, err = store.ResolveToDetached("refs/heads/trailing-ws")
if err != nil {
- t.Fatalf("ResolveFully(trailing-ws): %v", err)
+ t.Fatalf("ResolveToDetached(trailing-ws): %v", err)
}
if got.ID != oid {
- t.Fatalf("ResolveFully(trailing-ws) = %s, want %s", got.ID, oid)
+ t.Fatalf("ResolveToDetached(trailing-ws) = %s, want %s", got.ID, oid)
}
_, err = store.Resolve("refs/heads/leading-ws")
@@ -219,11 +219,11 @@ func TestFilesPackedRefsReadSemanticsMatchGit(t *testing.T) {
got, err := store.ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if got.ID == oneID {
- t.Fatalf("ResolveFully(main) unexpectedly returned stale packed id %s", oneID)
+ t.Fatalf("ResolveToDetached(main) unexpectedly returned stale packed id %s", oneID)
}
tagRef, err := store.Resolve("refs/tags/v1.0")
diff --git a/refstore/files/transaction_dirs_test.go b/refstore/files/transaction_dirs_test.go
index 09dc29fd..08d07197 100644
--- a/refstore/files/transaction_dirs_test.go
+++ b/refstore/files/transaction_dirs_test.go
@@ -59,7 +59,7 @@ func TestFilesTransactionEmptyDirectoriesDoNotBlock(t *testing.T) {
got, err := store.ResolveToDetached("refs/e-update/foo")
if err != nil {
- t.Fatalf("ResolveFully(updated foo): %v", err)
+ t.Fatalf("ResolveToDetached(updated foo): %v", err)
}
if got.ID != newID {
@@ -86,7 +86,7 @@ func TestFilesTransactionEmptyDirectoriesDoNotBlock(t *testing.T) {
got, err = store.ResolveToDetached("refs/e-create/foo")
if err != nil {
- t.Fatalf("ResolveFully(created foo): %v", err)
+ t.Fatalf("ResolveToDetached(created foo): %v", err)
}
if got.ID != oldID {
diff --git a/refstore/files/transaction_pseudoref_test.go b/refstore/files/transaction_pseudoref_test.go
index e313ad63..5ecae07b 100644
--- a/refstore/files/transaction_pseudoref_test.go
+++ b/refstore/files/transaction_pseudoref_test.go
@@ -37,7 +37,7 @@ func TestFilesTransactionPseudorefLifecycle(t *testing.T) {
got, err := store.ResolveToDetached("PSEUDOREF")
if err != nil {
- t.Fatalf("ResolveFully(PSEUDOREF): %v", err)
+ t.Fatalf("ResolveToDetached(PSEUDOREF): %v", err)
}
if got.ID != aID {
@@ -61,7 +61,7 @@ func TestFilesTransactionPseudorefLifecycle(t *testing.T) {
got, err = store.ResolveToDetached("PSEUDOREF")
if err != nil {
- t.Fatalf("ResolveFully(PSEUDOREF) after update: %v", err)
+ t.Fatalf("ResolveToDetached(PSEUDOREF) after update: %v", err)
}
if got.ID != bID {
diff --git a/refstore/files/transaction_symbolic_test.go b/refstore/files/transaction_symbolic_test.go
index 691e4ecf..1524d52e 100644
--- a/refstore/files/transaction_symbolic_test.go
+++ b/refstore/files/transaction_symbolic_test.go
@@ -56,7 +56,7 @@ func TestFilesTransactionDirectSymbolicDeletes(t *testing.T) {
got, err := store.ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if got.ID != mainID {
diff --git a/refstore/files/transaction_update_test.go b/refstore/files/transaction_update_test.go
index 9ed32179..58546341 100644
--- a/refstore/files/transaction_update_test.go
+++ b/refstore/files/transaction_update_test.go
@@ -40,11 +40,11 @@ func TestFilesTransactionPackedUpdateCreatesLooseOverride(t *testing.T) {
got, err := store.ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if got.ID != newID {
- t.Fatalf("ResolveFully(main) = %s, want %s", got.ID, newID)
+ t.Fatalf("ResolveToDetached(main) = %s, want %s", got.ID, newID)
}
packedRefs := string(testRepo.ReadFile(t, "packed-refs"))
@@ -139,7 +139,7 @@ func TestFilesTransactionDerefAndDirectSymbolic(t *testing.T) {
mainRef, err := store.ResolveToDetached("refs/heads/main")
if err != nil {
- t.Fatalf("ResolveFully(main): %v", err)
+ t.Fatalf("ResolveToDetached(main): %v", err)
}
if mainRef.ID != secondID {
diff --git a/refstore/files/worktree_test.go b/refstore/files/worktree_test.go
index 2d973d51..2e24fb01 100644
--- a/refstore/files/worktree_test.go
+++ b/refstore/files/worktree_test.go
@@ -52,56 +52,56 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) {
got, err := mainStore.ResolveToDetached("refs/worktree/foo")
if err != nil {
- t.Fatalf("ResolveFully(main refs/worktree/foo): %v", err)
+ t.Fatalf("ResolveToDetached(main refs/worktree/foo): %v", err)
}
if got.ID != initialID {
- t.Fatalf("ResolveFully(main refs/worktree/foo) = %s, want %s", got.ID, initialID)
+ t.Fatalf("ResolveToDetached(main refs/worktree/foo) = %s, want %s", got.ID, initialID)
}
got, err = wt1Store.ResolveToDetached("refs/worktree/foo")
if err != nil {
- t.Fatalf("ResolveFully(wt1 refs/worktree/foo): %v", err)
+ t.Fatalf("ResolveToDetached(wt1 refs/worktree/foo): %v", err)
}
if got.ID != wt1ID {
- t.Fatalf("ResolveFully(wt1 refs/worktree/foo) = %s, want %s", got.ID, wt1ID)
+ t.Fatalf("ResolveToDetached(wt1 refs/worktree/foo) = %s, want %s", got.ID, wt1ID)
}
got, err = wt2Store.ResolveToDetached("refs/worktree/foo")
if err != nil {
- t.Fatalf("ResolveFully(wt2 refs/worktree/foo): %v", err)
+ t.Fatalf("ResolveToDetached(wt2 refs/worktree/foo): %v", err)
}
if got.ID != wt2ID {
- t.Fatalf("ResolveFully(wt2 refs/worktree/foo) = %s, want %s", got.ID, wt2ID)
+ t.Fatalf("ResolveToDetached(wt2 refs/worktree/foo) = %s, want %s", got.ID, wt2ID)
}
got, err = wt1Store.ResolveToDetached("main-worktree/HEAD")
if err != nil {
- t.Fatalf("ResolveFully(wt1 main-worktree/HEAD): %v", err)
+ t.Fatalf("ResolveToDetached(wt1 main-worktree/HEAD): %v", err)
}
if got.ID != initialID {
- t.Fatalf("ResolveFully(wt1 main-worktree/HEAD) = %s, want %s", got.ID, initialID)
+ t.Fatalf("ResolveToDetached(wt1 main-worktree/HEAD) = %s, want %s", got.ID, initialID)
}
got, err = mainStore.ResolveToDetached("worktrees/wt1/HEAD")
if err != nil {
- t.Fatalf("ResolveFully(main worktrees/wt1/HEAD): %v", err)
+ t.Fatalf("ResolveToDetached(main worktrees/wt1/HEAD): %v", err)
}
if got.ID != wt1ID {
- t.Fatalf("ResolveFully(main worktrees/wt1/HEAD) = %s, want %s", got.ID, wt1ID)
+ t.Fatalf("ResolveToDetached(main worktrees/wt1/HEAD) = %s, want %s", got.ID, wt1ID)
}
got, err = wt2Store.ResolveToDetached("worktrees/wt1/HEAD")
if err != nil {
- t.Fatalf("ResolveFully(wt2 worktrees/wt1/HEAD): %v", err)
+ t.Fatalf("ResolveToDetached(wt2 worktrees/wt1/HEAD): %v", err)
}
if got.ID != wt1ID {
- t.Fatalf("ResolveFully(wt2 worktrees/wt1/HEAD) = %s, want %s", got.ID, wt1ID)
+ t.Fatalf("ResolveToDetached(wt2 worktrees/wt1/HEAD) = %s, want %s", got.ID, wt1ID)
}
assertListMatchesGitForEachRef(t, testRepo.Run(t, "for-each-ref", "--format=%(refname)"), mainStore)
@@ -166,20 +166,20 @@ func TestFilesTransactionPerWorktreeRefsMatchGit(t *testing.T) {
got, err := mainStore.ResolveToDetached("refs/bisect/main-only")
if err != nil {
- t.Fatalf("ResolveFully(main-only): %v", err)
+ t.Fatalf("ResolveToDetached(main-only): %v", err)
}
if got.ID != mainID {
- t.Fatalf("ResolveFully(main-only) = %s, want %s", got.ID, mainID)
+ t.Fatalf("ResolveToDetached(main-only) = %s, want %s", got.ID, mainID)
}
got, err = wt1Store.ResolveToDetached("refs/bisect/wt-only")
if err != nil {
- t.Fatalf("ResolveFully(wt-only): %v", err)
+ t.Fatalf("ResolveToDetached(wt-only): %v", err)
}
if got.ID != wt1ID {
- t.Fatalf("ResolveFully(wt-only) = %s, want %s", got.ID, wt1ID)
+ t.Fatalf("ResolveToDetached(wt-only) = %s, want %s", got.ID, wt1ID)
}
_, err = mainStore.Resolve("refs/bisect/wt-only")
diff --git a/refstore/reading.go b/refstore/reading.go
index 478ba4af..c302f350 100644
--- a/refstore/reading.go
+++ b/refstore/reading.go
@@ -11,13 +11,13 @@ type ReadingStore interface {
// If the reference does not exist, implementations should return
// ErrReferenceNotFound.
Resolve(name string) (ref.Ref, error)
- // ResolveFully resolves a reference name to a detached object ID.
+ // ResolveToDetached resolves a reference name to a detached object ID.
//
// Implementations may use backend-local lookup semantics for symbolic hops.
// Callers that need cross-backend symbolic resolution (for example in a
// chain of stores) should prefer repeatedly calling Resolve.
//
- // ResolveFully resolves symbolic references only. It does not imply peeling
+ // ResolveToDetached resolves symbolic references only. It does not imply peeling
// annotated tag objects.
ResolveToDetached(name string) (ref.Detached, error)
// List returns references matching pattern.
diff --git a/repository/refs_test.go b/repository/refs_test.go
index 0bf6238d..f9306d4a 100644
--- a/repository/refs_test.go
+++ b/repository/refs_test.go
@@ -58,11 +58,11 @@ func TestOpenFilesRefFormat(t *testing.T) {
head, err := repo.Refs().ResolveToDetached("HEAD")
if err != nil {
- t.Fatalf("ResolveFully(HEAD): %v", err)
+ t.Fatalf("ResolveToDetached(HEAD): %v", err)
}
if head.ID != commitID {
- t.Fatalf("ResolveFully(HEAD) id = %s, want %s", head.ID, commitID)
+ t.Fatalf("ResolveToDetached(HEAD) id = %s, want %s", head.ID, commitID)
}
})
}
@@ -74,7 +74,7 @@ func TestOpenFilesWithPackedRefs(t *testing.T) {
repoHarness := newRepoForRefs(t, algo, "files")
commitID := writeMainAndHead(t, repoHarness)
repoHarness.PackRefs(t, "--all", "--prune")
- assertResolveFully(t, repoHarness, "refs/heads/main", commitID)
+ assertResolveToDetached(t, repoHarness, "refs/heads/main", commitID)
})
}
@@ -97,17 +97,17 @@ func writeMainAndHead(t *testing.T, repoHarness *testgit.TestRepo) objectid.Obje
return commitID
}
-func assertResolveFully(t *testing.T, repoHarness *testgit.TestRepo, name string, want objectid.ObjectID) {
+func assertResolveToDetached(t *testing.T, repoHarness *testgit.TestRepo, name string, want objectid.ObjectID) {
t.Helper()
repo := repoHarness.OpenRepository(t)
resolved, err := repo.Refs().ResolveToDetached(name)
if err != nil {
- t.Fatalf("ResolveFully(%s): %v", name, err)
+ t.Fatalf("ResolveToDetached(%s): %v", name, err)
}
if resolved.ID != want {
- t.Fatalf("ResolveFully(%s) id = %s, want %s", name, resolved.ID, want)
+ t.Fatalf("ResolveToDetached(%s) id = %s, want %s", name, resolved.ID, want)
}
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-05-25 15:32:13 +0000