diff options
Diffstat (limited to 'object/fetch/exact_reader.go')
| -rw-r--r-- | object/fetch/exact_reader.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/object/fetch/exact_reader.go b/object/fetch/exact_reader.go index 54cf246c..d588480d 100644 --- a/object/fetch/exact_reader.go +++ b/object/fetch/exact_reader.go @@ -1,25 +1,25 @@ package fetch import ( - "fmt" "io" + giterrors "codeberg.org/lindenii/furgit/errors" objectid "codeberg.org/lindenii/furgit/object/id" objecttype "codeberg.org/lindenii/furgit/object/type" ) // exactReader reads one object's content stream and verifies that its header // type matches wantType. -func (r *Fetcher) exactReader(id objectid.ObjectID, wantType objecttype.Type, wantName string) (io.ReadCloser, int64, error) { +func (r *Fetcher) exactReader(id objectid.ObjectID, wantType objecttype.Type) (io.ReadCloser, int64, error) { gotType, size, rc, err := r.store.ReadReaderContent(id) if err != nil { - return nil, 0, err + return nil, 0, wrapObjectReadError(id, err) } if gotType != wantType { _ = rc.Close() - return nil, 0, fmt.Errorf("object/fetch: expected %s object %s, got %v", wantName, id, gotType) + return nil, 0, &giterrors.ObjectTypeError{OID: id, Got: gotType, Want: wantType} } return rc, size, nil |