From b46eba214daa9a6ede179ed543033b0f3485ec2e Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Thu, 12 Mar 2026 00:11:45 +0800 Subject: refstore: s/ResolveFully/ResolveToDetached/g --- cmd/show-object/main.go | 2 +- receivepack/advertise.go | 2 +- receivepack/hooks/reject_force_push.go | 2 +- receivepack/int_test.go | 10 +++++----- refstore/chain/resolve.go | 2 +- refstore/files/packed_delete_test.go | 10 +++++----- refstore/files/read_resolve_fully.go | 2 +- refstore/files/resolve_list_test.go | 8 ++++---- refstore/files/transaction_dirs_test.go | 4 ++-- refstore/files/transaction_pseudoref_test.go | 4 ++-- refstore/files/transaction_symbolic_test.go | 2 +- refstore/files/transaction_update_test.go | 4 ++-- refstore/files/worktree_test.go | 16 ++++++++-------- refstore/reading.go | 2 +- repository/refs_test.go | 4 ++-- repository/traversal_test.go | 2 +- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/cmd/show-object/main.go b/cmd/show-object/main.go index b50929a0..e92fa472 100644 --- a/cmd/show-object/main.go +++ b/cmd/show-object/main.go @@ -73,7 +73,7 @@ func resolveInput(repo *repository.Repository, input string) (objectid.ObjectID, return id, nil } - resolved, err := repo.Refs().ResolveFully(input) + resolved, err := repo.Refs().ResolveToDetached(input) if err != nil { return objectid.ObjectID{}, err } diff --git a/receivepack/advertise.go b/receivepack/advertise.go index 64fb2fe7..5cac5524 100644 --- a/receivepack/advertise.go +++ b/receivepack/advertise.go @@ -37,7 +37,7 @@ func buildAdvertisedRefs(opts Options, listed []ref.Ref) ([]common.AdvertisedRef continue } - head, err := opts.Refs.ResolveFully("HEAD") + head, err := opts.Refs.ResolveToDetached("HEAD") if err != nil { if errors.Is(err, refstore.ErrReferenceNotFound) { continue diff --git a/receivepack/hooks/reject_force_push.go b/receivepack/hooks/reject_force_push.go index 4bc749a5..9902c9be 100644 --- a/receivepack/hooks/reject_force_push.go +++ b/receivepack/hooks/reject_force_push.go @@ -33,7 +33,7 @@ func RejectForcePush() receivepack.Hook { continue } - current, err := req.Refs.ResolveFully(update.Name) + current, err := req.Refs.ResolveToDetached(update.Name) switch { case err == nil: case errors.Is(err, refstore.ErrReferenceNotFound): diff --git a/receivepack/int_test.go b/receivepack/int_test.go index b44bc2b8..e6d5476a 100644 --- a/receivepack/int_test.go +++ b/receivepack/int_test.go @@ -391,7 +391,7 @@ func TestReceivePackPackCreatePromotesObjectsAndUpdatesRef(t *testing.T) { reopened := receiver.OpenRepository(t) - resolved, err := reopened.Refs().ResolveFully("refs/heads/main") + resolved, err := reopened.Refs().ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } @@ -695,7 +695,7 @@ func TestReceivePackPredefinedRejectForcePushHookRejectsNonFastForward(t *testin t.Fatalf("unexpected receive-pack output %q", got) } - resolved, err := repo.Refs().ResolveFully("refs/heads/main") + resolved, err := repo.Refs().ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } @@ -786,7 +786,7 @@ func TestReceivePackGitPushCreatesBranch(t *testing.T) { t.Fatalf("ReceivePack: %v", serverErr) } - resolved, err := receiver.OpenRepository(t).Refs().ResolveFully("refs/heads/main") + resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } @@ -836,7 +836,7 @@ func TestReceivePackGitPushRefUpdateWithoutNewObjectsSucceeds(t *testing.T) { t.Fatalf("ReceivePack: %v", serverErr) } - resolved, err := receiver.OpenRepository(t).Refs().ResolveFully("refs/heads/topic") + resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/topic") if err != nil { t.Fatalf("ResolveFully(topic): %v", err) } @@ -937,7 +937,7 @@ func TestReceivePackGitPushRejectsForcedUpdateViaHook(t *testing.T) { t.Fatalf("git push output missing non-fast-forward message\nstdout=%s\nstderr=%s", stdout, stderr) } - resolved, err := receiver.OpenRepository(t).Refs().ResolveFully("refs/heads/main") + resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } diff --git a/refstore/chain/resolve.go b/refstore/chain/resolve.go index 007c3668..c9dcc501 100644 --- a/refstore/chain/resolve.go +++ b/refstore/chain/resolve.go @@ -36,7 +36,7 @@ func (chain *Chain) Resolve(name string) (ref.Ref, error) { // // It intentionally does not call backend ResolveFully. This allows symbolic // references to cross backends in the chain. -func (chain *Chain) ResolveFully(name string) (ref.Detached, error) { +func (chain *Chain) ResolveToDetached(name string) (ref.Detached, error) { cur := name seen := map[string]struct{}{} diff --git a/refstore/files/packed_delete_test.go b/refstore/files/packed_delete_test.go index 23df14e8..ed05f20b 100644 --- a/refstore/files/packed_delete_test.go +++ b/refstore/files/packed_delete_test.go @@ -53,7 +53,7 @@ func TestFilesTransactionPackedDeleteFailureLeavesRefsUnchanged(t *testing.T) { t.Fatalf("ShowRef after failed delete = %v, want %v", actual, unchanged) } - got, err := store.ResolveFully(prefix + "/foo") + got, err := store.ResolveToDetached(prefix + "/foo") if err != nil { t.Fatalf("ResolveFully(lock held): %v", err) } @@ -106,7 +106,7 @@ func TestFilesTransactionPackedDeleteFailureLeavesRefsUnchanged(t *testing.T) { t.Fatalf("ShowRef after failed delete = %v, want %v", actual, unchanged) } - got, err := store.ResolveFully(prefix + "/foo") + got, err := store.ResolveToDetached(prefix + "/foo") if err != nil { t.Fatalf("ResolveFully(new exists): %v", err) } @@ -182,7 +182,7 @@ func TestFilesPackedRefIgnoresEmptyDirectories(t *testing.T) { store := openFilesStore(t, testRepo, algo) - got, err := store.ResolveFully(name) + got, err := store.ResolveToDetached(name) if err != nil { t.Fatalf("ResolveFully: %v", err) } @@ -204,7 +204,7 @@ func TestFilesPackedRefIgnoresEmptyDirectories(t *testing.T) { fullActual := make([]string, 0, len(actual)) for _, name := range actual { - refValue, resolveErr := store.ResolveFully(name) + refValue, resolveErr := store.ResolveToDetached(name) if resolveErr != nil { t.Fatalf("ResolveFully(%q): %v", name, resolveErr) } @@ -262,7 +262,7 @@ func TestFilesDeleteWaitsForPackedRefsLockWithoutIntermediateState(t *testing.T) default: } - got, err := store.ResolveFully(prefix + "/foo") + got, err := store.ResolveToDetached(prefix + "/foo") if err != nil { t.Fatalf("ResolveFully while lock held: %v", err) } diff --git a/refstore/files/read_resolve_fully.go b/refstore/files/read_resolve_fully.go index 7bc4cfea..6871712c 100644 --- a/refstore/files/read_resolve_fully.go +++ b/refstore/files/read_resolve_fully.go @@ -9,7 +9,7 @@ import ( // ResolveFully resolves symbolic references through the visible files store // namespace until one detached reference is reached. -func (store *Store) ResolveFully(name string) (ref.Detached, error) { +func (store *Store) ResolveToDetached(name string) (ref.Detached, error) { cur := name seen := make(map[string]struct{}) diff --git a/refstore/files/resolve_list_test.go b/refstore/files/resolve_list_test.go index 0e3f2c7c..41bd1ad2 100644 --- a/refstore/files/resolve_list_test.go +++ b/refstore/files/resolve_list_test.go @@ -53,7 +53,7 @@ func TestFilesResolveAndListOverlay(t *testing.T) { t.Fatalf("Resolve(HEAD) target = %q, want %q", headSym.Target, "refs/heads/main") } - fullHead, err := store.ResolveFully("HEAD") + fullHead, err := store.ResolveToDetached("HEAD") if err != nil { t.Fatalf("ResolveFully(HEAD): %v", err) } @@ -96,7 +96,7 @@ func TestFilesLooseRefParsingMatchesGit(t *testing.T) { store := openFilesStore(t, testRepo, algo) - got, err := store.ResolveFully("refs/heads/no-lf") + got, err := store.ResolveToDetached("refs/heads/no-lf") if err != nil { t.Fatalf("ResolveFully(no-lf): %v", err) } @@ -105,7 +105,7 @@ func TestFilesLooseRefParsingMatchesGit(t *testing.T) { t.Fatalf("ResolveFully(no-lf) = %s, want %s", got.ID, oid) } - got, err = store.ResolveFully("refs/heads/trailing-ws") + got, err = store.ResolveToDetached("refs/heads/trailing-ws") if err != nil { t.Fatalf("ResolveFully(trailing-ws): %v", err) } @@ -217,7 +217,7 @@ func TestFilesPackedRefsReadSemanticsMatchGit(t *testing.T) { store := openFilesStore(t, testRepo, algo) - got, err := store.ResolveFully("refs/heads/main") + got, err := store.ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } diff --git a/refstore/files/transaction_dirs_test.go b/refstore/files/transaction_dirs_test.go index 7a8f7c14..09dc29fd 100644 --- a/refstore/files/transaction_dirs_test.go +++ b/refstore/files/transaction_dirs_test.go @@ -57,7 +57,7 @@ func TestFilesTransactionEmptyDirectoriesDoNotBlock(t *testing.T) { t.Fatalf("Commit(update with empty directories): %v", err) } - got, err := store.ResolveFully("refs/e-update/foo") + got, err := store.ResolveToDetached("refs/e-update/foo") if err != nil { t.Fatalf("ResolveFully(updated foo): %v", err) } @@ -84,7 +84,7 @@ func TestFilesTransactionEmptyDirectoriesDoNotBlock(t *testing.T) { t.Fatalf("Commit(create with empty directories): %v", err) } - got, err = store.ResolveFully("refs/e-create/foo") + got, err = store.ResolveToDetached("refs/e-create/foo") if err != nil { t.Fatalf("ResolveFully(created foo): %v", err) } diff --git a/refstore/files/transaction_pseudoref_test.go b/refstore/files/transaction_pseudoref_test.go index 2111b5db..e313ad63 100644 --- a/refstore/files/transaction_pseudoref_test.go +++ b/refstore/files/transaction_pseudoref_test.go @@ -35,7 +35,7 @@ func TestFilesTransactionPseudorefLifecycle(t *testing.T) { t.Fatalf("Commit(create PSEUDOREF): %v", err) } - got, err := store.ResolveFully("PSEUDOREF") + got, err := store.ResolveToDetached("PSEUDOREF") if err != nil { t.Fatalf("ResolveFully(PSEUDOREF): %v", err) } @@ -59,7 +59,7 @@ func TestFilesTransactionPseudorefLifecycle(t *testing.T) { t.Fatalf("Commit(update PSEUDOREF): %v", err) } - got, err = store.ResolveFully("PSEUDOREF") + got, err = store.ResolveToDetached("PSEUDOREF") if err != nil { t.Fatalf("ResolveFully(PSEUDOREF) after update: %v", err) } diff --git a/refstore/files/transaction_symbolic_test.go b/refstore/files/transaction_symbolic_test.go index 864429db..691e4ecf 100644 --- a/refstore/files/transaction_symbolic_test.go +++ b/refstore/files/transaction_symbolic_test.go @@ -54,7 +54,7 @@ func TestFilesTransactionDirectSymbolicDeletes(t *testing.T) { t.Fatalf("Resolve(SYMREF after delete) err=%v", err) } - got, err := store.ResolveFully("refs/heads/main") + got, err := store.ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } diff --git a/refstore/files/transaction_update_test.go b/refstore/files/transaction_update_test.go index 8bbf06be..9ed32179 100644 --- a/refstore/files/transaction_update_test.go +++ b/refstore/files/transaction_update_test.go @@ -38,7 +38,7 @@ func TestFilesTransactionPackedUpdateCreatesLooseOverride(t *testing.T) { t.Fatalf("Commit: %v", err) } - got, err := store.ResolveFully("refs/heads/main") + got, err := store.ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } @@ -137,7 +137,7 @@ func TestFilesTransactionDerefAndDirectSymbolic(t *testing.T) { t.Fatalf("Commit(update HEAD): %v", err) } - mainRef, err := store.ResolveFully("refs/heads/main") + mainRef, err := store.ResolveToDetached("refs/heads/main") if err != nil { t.Fatalf("ResolveFully(main): %v", err) } diff --git a/refstore/files/worktree_test.go b/refstore/files/worktree_test.go index 88167200..2d973d51 100644 --- a/refstore/files/worktree_test.go +++ b/refstore/files/worktree_test.go @@ -50,7 +50,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { wt1Store := openFilesStoreAt(t, openGitRootUnder(t, repoRoot, "wt1"), algo) wt2Store := openFilesStoreAt(t, openGitRootUnder(t, repoRoot, "wt2"), algo) - got, err := mainStore.ResolveFully("refs/worktree/foo") + got, err := mainStore.ResolveToDetached("refs/worktree/foo") if err != nil { t.Fatalf("ResolveFully(main refs/worktree/foo): %v", err) } @@ -59,7 +59,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("ResolveFully(main refs/worktree/foo) = %s, want %s", got.ID, initialID) } - got, err = wt1Store.ResolveFully("refs/worktree/foo") + got, err = wt1Store.ResolveToDetached("refs/worktree/foo") if err != nil { t.Fatalf("ResolveFully(wt1 refs/worktree/foo): %v", err) } @@ -68,7 +68,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("ResolveFully(wt1 refs/worktree/foo) = %s, want %s", got.ID, wt1ID) } - got, err = wt2Store.ResolveFully("refs/worktree/foo") + got, err = wt2Store.ResolveToDetached("refs/worktree/foo") if err != nil { t.Fatalf("ResolveFully(wt2 refs/worktree/foo): %v", err) } @@ -77,7 +77,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("ResolveFully(wt2 refs/worktree/foo) = %s, want %s", got.ID, wt2ID) } - got, err = wt1Store.ResolveFully("main-worktree/HEAD") + got, err = wt1Store.ResolveToDetached("main-worktree/HEAD") if err != nil { t.Fatalf("ResolveFully(wt1 main-worktree/HEAD): %v", err) } @@ -86,7 +86,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("ResolveFully(wt1 main-worktree/HEAD) = %s, want %s", got.ID, initialID) } - got, err = mainStore.ResolveFully("worktrees/wt1/HEAD") + got, err = mainStore.ResolveToDetached("worktrees/wt1/HEAD") if err != nil { t.Fatalf("ResolveFully(main worktrees/wt1/HEAD): %v", err) } @@ -95,7 +95,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("ResolveFully(main worktrees/wt1/HEAD) = %s, want %s", got.ID, wt1ID) } - got, err = wt2Store.ResolveFully("worktrees/wt1/HEAD") + got, err = wt2Store.ResolveToDetached("worktrees/wt1/HEAD") if err != nil { t.Fatalf("ResolveFully(wt2 worktrees/wt1/HEAD): %v", err) } @@ -164,7 +164,7 @@ func TestFilesTransactionPerWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("Commit(wt-only): %v", err) } - got, err := mainStore.ResolveFully("refs/bisect/main-only") + got, err := mainStore.ResolveToDetached("refs/bisect/main-only") if err != nil { t.Fatalf("ResolveFully(main-only): %v", err) } @@ -173,7 +173,7 @@ func TestFilesTransactionPerWorktreeRefsMatchGit(t *testing.T) { t.Fatalf("ResolveFully(main-only) = %s, want %s", got.ID, mainID) } - got, err = wt1Store.ResolveFully("refs/bisect/wt-only") + got, err = wt1Store.ResolveToDetached("refs/bisect/wt-only") if err != nil { t.Fatalf("ResolveFully(wt-only): %v", err) } diff --git a/refstore/reading.go b/refstore/reading.go index eb499deb..478ba4af 100644 --- a/refstore/reading.go +++ b/refstore/reading.go @@ -19,7 +19,7 @@ type ReadingStore interface { // // ResolveFully resolves symbolic references only. It does not imply peeling // annotated tag objects. - ResolveFully(name string) (ref.Detached, error) + ResolveToDetached(name string) (ref.Detached, error) // List returns references matching pattern. // // The exact pattern language is backend-defined. diff --git a/repository/refs_test.go b/repository/refs_test.go index 8b2676a2..0bf6238d 100644 --- a/repository/refs_test.go +++ b/repository/refs_test.go @@ -56,7 +56,7 @@ func TestOpenFilesRefFormat(t *testing.T) { t.Fatalf("Resolve(refs/heads/main) id = %s, want %s", detached.ID, commitID) } - head, err := repo.Refs().ResolveFully("HEAD") + head, err := repo.Refs().ResolveToDetached("HEAD") if err != nil { t.Fatalf("ResolveFully(HEAD): %v", err) } @@ -102,7 +102,7 @@ func assertResolveFully(t *testing.T, repoHarness *testgit.TestRepo, name string repo := repoHarness.OpenRepository(t) - resolved, err := repo.Refs().ResolveFully(name) + resolved, err := repo.Refs().ResolveToDetached(name) if err != nil { t.Fatalf("ResolveFully(%s): %v", name, err) } diff --git a/repository/traversal_test.go b/repository/traversal_test.go index d5eaabb4..7472250e 100644 --- a/repository/traversal_test.go +++ b/repository/traversal_test.go @@ -144,7 +144,7 @@ func walkRepositoryFromRoot(t *testing.T, root *os.Root, label string) { defer func() { _ = repo.Close() }() - head, err := repo.Refs().ResolveFully("HEAD") + head, err := repo.Refs().ResolveToDetached("HEAD") if err != nil { t.Fatalf("ResolveRefFully(HEAD): %v", err) } -- cgit v1.3.1-10-gc9f91