From e67774f1a12cb0176b58083a802de3d54eee9b85 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 7 Mar 2026 00:11:12 +0800 Subject: objectstored/refstore: Weird ireturn behavior --- objectstored/blob.go | 4 +--- objectstored/commit.go | 4 +--- objectstored/objectstored.go | 4 +--- objectstored/tree.go | 4 +--- refstore/loose/resolve.go | 8 ++------ refstore/packed/resolve.go | 4 +--- 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/objectstored/blob.go b/objectstored/blob.go index b3a867c3..c9733e0a 100644 --- a/objectstored/blob.go +++ b/objectstored/blob.go @@ -25,9 +25,7 @@ func (stored *StoredBlob) ID() objectid.ObjectID { } // Object returns the parsed blob as the generic object interface. -// -//nolint:ireturn -func (stored *StoredBlob) Object() object.Object { +func (stored *StoredBlob) Object() object.Object { //nolint:ireturn return stored.blob } diff --git a/objectstored/commit.go b/objectstored/commit.go index de22e847..74016c49 100644 --- a/objectstored/commit.go +++ b/objectstored/commit.go @@ -22,9 +22,7 @@ func (stored *StoredCommit) ID() objectid.ObjectID { } // Object returns the parsed commit as the generic object interface. -// -//nolint:ireturn -func (stored *StoredCommit) Object() object.Object { +func (stored *StoredCommit) Object() object.Object { //nolint:ireturn return stored.commit } diff --git a/objectstored/objectstored.go b/objectstored/objectstored.go index b05496df..767d173b 100644 --- a/objectstored/objectstored.go +++ b/objectstored/objectstored.go @@ -22,9 +22,7 @@ func (stored *StoredTag) ID() objectid.ObjectID { } // Object returns the parsed tag as the generic object interface. -// -//nolint:ireturn -func (stored *StoredTag) Object() object.Object { +func (stored *StoredTag) Object() object.Object { //nolint:ireturn return stored.tag } diff --git a/objectstored/tree.go b/objectstored/tree.go index 46e6ce6c..fd264047 100644 --- a/objectstored/tree.go +++ b/objectstored/tree.go @@ -22,9 +22,7 @@ func (stored *StoredTree) ID() objectid.ObjectID { } // Object returns the parsed tree as the generic object interface. -// -//nolint:ireturn -func (stored *StoredTree) Object() object.Object { +func (stored *StoredTree) Object() object.Object { //nolint:ireturn return stored.tree } diff --git a/refstore/loose/resolve.go b/refstore/loose/resolve.go index 5c5298b8..e43f614f 100644 --- a/refstore/loose/resolve.go +++ b/refstore/loose/resolve.go @@ -12,9 +12,7 @@ import ( ) // Resolve resolves a loose reference name to symbolic or detached form. -// -//nolint:ireturn -func (store *Store) Resolve(name string) (ref.Ref, error) { +func (store *Store) Resolve(name string) (ref.Ref, error) { //nolint:ireturn if name == "" { return nil, refstore.ErrReferenceNotFound } @@ -65,9 +63,7 @@ func (store *Store) ResolveFully(name string) (ref.Detached, error) { } // resolveOne resolves one loose ref file without symbolic recursion. -// -//nolint:ireturn -func (store *Store) resolveOne(name string) (ref.Ref, error) { +func (store *Store) resolveOne(name string) (ref.Ref, error) { //nolint:ireturn data, err := store.root.ReadFile(name) if err != nil { if errors.Is(err, os.ErrNotExist) { diff --git a/refstore/packed/resolve.go b/refstore/packed/resolve.go index 37e291a5..527b8904 100644 --- a/refstore/packed/resolve.go +++ b/refstore/packed/resolve.go @@ -6,9 +6,7 @@ import ( ) // Resolve resolves a packed reference name to a detached ref. -// -//nolint:ireturn -func (store *Store) Resolve(name string) (ref.Ref, error) { +func (store *Store) Resolve(name string) (ref.Ref, error) { //nolint:ireturn detached, ok := store.byName[name] if !ok { return nil, refstore.ErrReferenceNotFound -- cgit v1.3.1-10-gc9f91