From 8630ab3a2fb3e6a5518156bc43bd4f6a81f21198 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Tue, 10 Mar 2026 14:20:30 +0800 Subject: Revert "object/header: Rename from objectheader" This reverts commit 85f1212724e037e6934203f04a3f6231ac609503. --- objectstore/packed/helpers_test.go | 6 +++--- objectstore/packed/read_bytes.go | 4 ++-- objectstore/packed/read_reader.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'objectstore/packed') diff --git a/objectstore/packed/helpers_test.go b/objectstore/packed/helpers_test.go index 63c01c3e..f07ff4e3 100644 --- a/objectstore/packed/helpers_test.go +++ b/objectstore/packed/helpers_test.go @@ -8,7 +8,7 @@ import ( "testing" "codeberg.org/lindenii/furgit/internal/testgit" - "codeberg.org/lindenii/furgit/object/header" + "codeberg.org/lindenii/furgit/objectheader" "codeberg.org/lindenii/furgit/objectid" "codeberg.org/lindenii/furgit/objectstore/packed" "codeberg.org/lindenii/furgit/objecttype" @@ -57,9 +57,9 @@ func expectedRawObject(t *testing.T, testRepo *testgit.TestRepo, id objectid.Obj body := testRepo.CatFile(t, typeName, id) - header, ok := header.Encode(ty, int64(len(body))) + header, ok := objectheader.Encode(ty, int64(len(body))) if !ok { - t.Fatalf("header.Encode failed") + t.Fatalf("objectheader.Encode failed") } raw := make([]byte, len(header)+len(body)) diff --git a/objectstore/packed/read_bytes.go b/objectstore/packed/read_bytes.go index 99e6635d..e272b626 100644 --- a/objectstore/packed/read_bytes.go +++ b/objectstore/packed/read_bytes.go @@ -3,7 +3,7 @@ package packed import ( "fmt" - "codeberg.org/lindenii/furgit/object/header" + "codeberg.org/lindenii/furgit/objectheader" "codeberg.org/lindenii/furgit/objectid" "codeberg.org/lindenii/furgit/objecttype" ) @@ -25,7 +25,7 @@ func (store *Store) ReadBytesFull(id objectid.ObjectID) ([]byte, error) { return nil, err } - header, ok := header.Encode(ty, int64(len(content))) + header, ok := objectheader.Encode(ty, int64(len(content))) if !ok { return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", ty) } diff --git a/objectstore/packed/read_reader.go b/objectstore/packed/read_reader.go index 12c8cc14..cbecaf2c 100644 --- a/objectstore/packed/read_reader.go +++ b/objectstore/packed/read_reader.go @@ -6,7 +6,7 @@ import ( "io" "codeberg.org/lindenii/furgit/internal/iolimit" - "codeberg.org/lindenii/furgit/object/header" + "codeberg.org/lindenii/furgit/objectheader" "codeberg.org/lindenii/furgit/objectid" "codeberg.org/lindenii/furgit/objecttype" packfmt "codeberg.org/lindenii/furgit/packfile" @@ -61,7 +61,7 @@ func (store *Store) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) } if packfmt.IsBaseObjectType(meta.ty) { - header, ok := header.Encode(meta.ty, meta.size) + header, ok := objectheader.Encode(meta.ty, meta.size) if !ok { return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", meta.ty) } -- cgit v1.3.1-10-gc9f91