From b35991ae49e2b4ea5b16b2db663c6b49f47b4e2e Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 8 Jun 2026 07:19:50 +0000 Subject: object/fetch: Receiver should use name fetcher --- object/fetch/tree.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'object/fetch/tree.go') diff --git a/object/fetch/tree.go b/object/fetch/tree.go index ef0f9e77..add41274 100644 --- a/object/fetch/tree.go +++ b/object/fetch/tree.go @@ -13,8 +13,8 @@ import ( // ExactTree reads, parses, and wraps the tree at id. // // Labels: Life-Parent. -func (r *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) { - parsed, err := r.parseObject(id) +func (fetcher *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) { + parsed, err := fetcher.parseObject(id) if err != nil { return nil, err } @@ -31,9 +31,9 @@ func (r *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) // commit, it returns the commit's root tree. // // Labels: Life-Parent. -func (r *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) { +func (fetcher *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) { for { - obj, err := r.ExactObject(id) + obj, err := fetcher.ExactObject(id) if err != nil { return nil, err } @@ -42,7 +42,7 @@ func (r *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error case *tree.Tree: return stored.New(id, parsed), nil case *commit.Commit: - return r.ExactTree(parsed.Tree) + return fetcher.ExactTree(parsed.Tree) case *tag.Tag: id = parsed.TargetID default: @@ -53,9 +53,9 @@ func (r *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error // PeelToTreeID peels tags until it reaches a tree object ID, or a commit whose // root tree object ID is then returned. -func (r *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) { +func (fetcher *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) { for { - ty, _, err := r.Header(id) + ty, _, err := fetcher.Header(id) if err != nil { return oid.ObjectID{}, err } @@ -64,14 +64,14 @@ func (r *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) { case typ.TypeTree: return id, nil case typ.TypeCommit: - commit, err := r.ExactCommit(id) + commit, err := fetcher.ExactCommit(id) if err != nil { return oid.ObjectID{}, err } return commit.Object().Tree, nil case typ.TypeTag: - tag, err := r.ExactTag(id) + tag, err := fetcher.ExactTag(id) if err != nil { return oid.ObjectID{}, err } -- cgit v1.3.1-10-gc9f91