diff options
| author |  Runxi Yu | 2026-03-29 15:10:21 +0000 |
|---|---|---|
| committer | Runxi Yu | 2026-03-29 15:13:51 +0000 |
| commit | 84aac13e64962806e5101abc461be50198ac5642 (patch) | |
| tree | e941df9d2caa4188e648249b1b28d2ea15c5a1a5 /object/fetch/peel_to_commit_id.go | |
| parent | cmd/receivepack9418: Actually I do need return here because defer. (diff) | |
| signature | No signature | |
object/fetch: Use proper errors
Diffstat (limited to 'object/fetch/peel_to_commit_id.go')
| -rw-r--r-- | object/fetch/peel_to_commit_id.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/object/fetch/peel_to_commit_id.go b/object/fetch/peel_to_commit_id.go index b6b257cf..e5a0766f 100644 --- a/object/fetch/peel_to_commit_id.go +++ b/object/fetch/peel_to_commit_id.go @@ -1,8 +1,7 @@ package fetch import ( - "fmt" - + giterrors "codeberg.org/lindenii/furgit/errors" objectid "codeberg.org/lindenii/furgit/object/id" objecttype "codeberg.org/lindenii/furgit/object/type" ) @@ -12,7 +11,7 @@ func (r *Fetcher) PeelToCommitID(id objectid.ObjectID) (objectid.ObjectID, error for { ty, _, err := r.store.ReadHeader(id) if err != nil { - return objectid.ObjectID{}, err + return objectid.ObjectID{}, wrapObjectReadError(id, err) } switch ty { @@ -31,9 +30,9 @@ func (r *Fetcher) PeelToCommitID(id objectid.ObjectID) (objectid.ObjectID, error objecttype.TypeFuture, objecttype.TypeOfsDelta, objecttype.TypeRefDelta: - return objectid.ObjectID{}, fmt.Errorf("object/fetch: expected commit-ish object %s, got %v", id, ty) + return objectid.ObjectID{}, &giterrors.ObjectTypeError{OID: id, Got: ty, Want: objecttype.TypeCommit} default: - return objectid.ObjectID{}, fmt.Errorf("object/fetch: expected commit-ish object %s, got %v", id, ty) + return objectid.ObjectID{}, &giterrors.ObjectTypeError{OID: id, Got: ty, Want: objecttype.TypeCommit} } } } |