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 --- receivepack/advertise.go | 2 +- receivepack/hooks/reject_force_push.go | 2 +- receivepack/int_test.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'receivepack') 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) } -- cgit v1.3.1-10-gc9f91