*: objectid -> object/id

42 files changed, 42 insertions, 42 deletions

diff --git a/objectstore/chain/bytes.go b/objectstore/chain/bytes.go
index f5e5ac6d..83d8957b 100644
--- a/objectstore/chain/bytes.go
+++ b/objectstore/chain/bytes.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/chain/header.go b/objectstore/chain/header.go
index 6937d6f3..44a365a5 100644
--- a/objectstore/chain/header.go
+++ b/objectstore/chain/header.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/chain/reader.go b/objectstore/chain/reader.go
index 2a19c6fb..d68f9965 100644
--- a/objectstore/chain/reader.go
+++ b/objectstore/chain/reader.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/chain/size.go b/objectstore/chain/size.go
index 9815317f..34f6234c 100644
--- a/objectstore/chain/size.go
+++ b/objectstore/chain/size.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 )
 
diff --git a/objectstore/loose/helpers_test.go b/objectstore/loose/helpers_test.go
index 46e6d453..f46147d2 100644
--- a/objectstore/loose/helpers_test.go
+++ b/objectstore/loose/helpers_test.go
@@ -7,7 +7,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/loose/paths.go b/objectstore/loose/paths.go
index e8020d72..ca15aa62 100644
--- a/objectstore/loose/paths.go
+++ b/objectstore/loose/paths.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 )
 
diff --git a/objectstore/loose/read_bytes.go b/objectstore/loose/read_bytes.go
index bff22e48..0b6da81b 100644
--- a/objectstore/loose/read_bytes.go
+++ b/objectstore/loose/read_bytes.go
@@ -1,7 +1,7 @@
 package loose
 
 import (
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/loose/read_header.go b/objectstore/loose/read_header.go
index 3d3d6b87..37bf40de 100644
--- a/objectstore/loose/read_header.go
+++ b/objectstore/loose/read_header.go
@@ -4,7 +4,7 @@ import (
 	"bufio"
 
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/loose/read_reader.go b/objectstore/loose/read_reader.go
index c0a64fe7..29b71627 100644
--- a/objectstore/loose/read_reader.go
+++ b/objectstore/loose/read_reader.go
@@ -9,7 +9,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
 	"codeberg.org/lindenii/furgit/internal/iolimit"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/loose/read_size.go b/objectstore/loose/read_size.go
index 289950d1..2ececc49 100644
--- a/objectstore/loose/read_size.go
+++ b/objectstore/loose/read_size.go
@@ -1,6 +1,6 @@
 package loose
 
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
 
 // ReadSize reads an object's declared content length.
 //
diff --git a/objectstore/loose/read_test.go b/objectstore/loose/read_test.go
index c1180f44..68b2d75b 100644
--- a/objectstore/loose/read_test.go
+++ b/objectstore/loose/read_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	"codeberg.org/lindenii/furgit/objectstore/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
diff --git a/objectstore/loose/store.go b/objectstore/loose/store.go
index 5cb83968..d8eba84e 100644
--- a/objectstore/loose/store.go
+++ b/objectstore/loose/store.go
@@ -4,7 +4,7 @@ package loose
 import (
 	"os"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // Store reads loose Git objects from an objects directory root.
diff --git a/objectstore/loose/write_bytes.go b/objectstore/loose/write_bytes.go
index 4853ffb1..ffc65117 100644
--- a/objectstore/loose/write_bytes.go
+++ b/objectstore/loose/write_bytes.go
@@ -3,7 +3,7 @@ package loose
 import (
 	"bytes"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/loose/write_reader.go b/objectstore/loose/write_reader.go
index f1a7d801..f686f279 100644
--- a/objectstore/loose/write_reader.go
+++ b/objectstore/loose/write_reader.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/loose/write_test.go b/objectstore/loose/write_test.go
index 90cedbd6..30d8dbdb 100644
--- a/objectstore/loose/write_test.go
+++ b/objectstore/loose/write_test.go
@@ -6,7 +6,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/loose/write_writer_finalize.go b/objectstore/loose/write_writer_finalize.go
index 5b7a6754..f8dee54d 100644
--- a/objectstore/loose/write_writer_finalize.go
+++ b/objectstore/loose/write_writer_finalize.go
@@ -5,7 +5,7 @@ import (
 	"io/fs"
 	"path/filepath"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // Close flushes and closes the underlying zlib stream and temp file.
diff --git a/objectstore/memory/add.go b/objectstore/memory/add.go
index 12781d7d..3b27f52d 100644
--- a/objectstore/memory/add.go
+++ b/objectstore/memory/add.go
@@ -2,7 +2,7 @@ package memory
 
 import (
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/memory/algorithm.go b/objectstore/memory/algorithm.go
index db43272e..bf7f3a82 100644
--- a/objectstore/memory/algorithm.go
+++ b/objectstore/memory/algorithm.go
@@ -1,6 +1,6 @@
 package memory
 
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
 
 // Algorithm returns the object ID algorithm used by the store.
 func (store *Store) Algorithm() objectid.Algorithm {
diff --git a/objectstore/memory/read_bytes.go b/objectstore/memory/read_bytes.go
index 15680a74..5ce7dc9e 100644
--- a/objectstore/memory/read_bytes.go
+++ b/objectstore/memory/read_bytes.go
@@ -2,7 +2,7 @@ package memory
 
 import (
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/memory/read_header.go b/objectstore/memory/read_header.go
index 07019654..cd987cfe 100644
--- a/objectstore/memory/read_header.go
+++ b/objectstore/memory/read_header.go
@@ -1,7 +1,7 @@
 package memory
 
 import (
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/memory/read_reader.go b/objectstore/memory/read_reader.go
index ad59246e..425c3034 100644
--- a/objectstore/memory/read_reader.go
+++ b/objectstore/memory/read_reader.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/memory/read_size.go b/objectstore/memory/read_size.go
index 3ca7789a..7045bd61 100644
--- a/objectstore/memory/read_size.go
+++ b/objectstore/memory/read_size.go
@@ -1,6 +1,6 @@
 package memory
 
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
 
 // ReadSize reads one object size.
 func (store *Store) ReadSize(id objectid.ObjectID) (int64, error) {
diff --git a/objectstore/memory/store.go b/objectstore/memory/store.go
index f7513094..8f212c38 100644
--- a/objectstore/memory/store.go
+++ b/objectstore/memory/store.go
@@ -1,7 +1,7 @@
 package memory
 
 import (
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // Store is one in-memory object store.
diff --git a/objectstore/mix/bytes.go b/objectstore/mix/bytes.go
index d312eecd..e81fa88c 100644
--- a/objectstore/mix/bytes.go
+++ b/objectstore/mix/bytes.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/mix/header.go b/objectstore/mix/header.go
index d86c6733..05d93353 100644
--- a/objectstore/mix/header.go
+++ b/objectstore/mix/header.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/mix/reader.go b/objectstore/mix/reader.go
index b9227bb5..6d099c6b 100644
--- a/objectstore/mix/reader.go
+++ b/objectstore/mix/reader.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/mix/size.go b/objectstore/mix/size.go
index 7a45123c..76f39fa7 100644
--- a/objectstore/mix/size.go
+++ b/objectstore/mix/size.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 )
 
diff --git a/objectstore/objectstore.go b/objectstore/objectstore.go
index 056669dc..d43dbccd 100644
--- a/objectstore/objectstore.go
+++ b/objectstore/objectstore.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/packed/entry_parse.go b/objectstore/packed/entry_parse.go
index 93451ee0..be8f3c4c 100644
--- a/objectstore/packed/entry_parse.go
+++ b/objectstore/packed/entry_parse.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"codeberg.org/lindenii/furgit/internal/intconv"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
diff --git a/objectstore/packed/helpers_test.go b/objectstore/packed/helpers_test.go
index 72c68d01..9d85e095 100644
--- a/objectstore/packed/helpers_test.go
+++ b/objectstore/packed/helpers_test.go
@@ -9,7 +9,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore/packed"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
diff --git a/objectstore/packed/idx.go b/objectstore/packed/idx.go
index db6a0136..5024f2f3 100644
--- a/objectstore/packed/idx.go
+++ b/objectstore/packed/idx.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"os"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // idxFile stores one mapped and validated idx v2 file.
diff --git a/objectstore/packed/idx_lookup.go b/objectstore/packed/idx_lookup.go
index a97c5e79..0bd11d1b 100644
--- a/objectstore/packed/idx_lookup.go
+++ b/objectstore/packed/idx_lookup.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // lookup resolves one object ID to its pack offset within this index.
diff --git a/objectstore/packed/idx_open.go b/objectstore/packed/idx_open.go
index 9eb92682..fabd0c00 100644
--- a/objectstore/packed/idx_open.go
+++ b/objectstore/packed/idx_open.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	"codeberg.org/lindenii/furgit/internal/intconv"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // openIndex returns one opened and parsed index, caching it by pack basename.
diff --git a/objectstore/packed/new.go b/objectstore/packed/new.go
index c8e7338e..a4d1752d 100644
--- a/objectstore/packed/new.go
+++ b/objectstore/packed/new.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // New creates a packed-object store rooted at an objects/pack directory.
diff --git a/objectstore/packed/pack_idx_checksum.go b/objectstore/packed/pack_idx_checksum.go
index 25556088..28d4c3db 100644
--- a/objectstore/packed/pack_idx_checksum.go
+++ b/objectstore/packed/pack_idx_checksum.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // verifyMappedPackMatchesMappedIdx compares one mapped pack trailer hash with
diff --git a/objectstore/packed/read_bytes.go b/objectstore/packed/read_bytes.go
index 03ee3dae..333cfaae 100644
--- a/objectstore/packed/read_bytes.go
+++ b/objectstore/packed/read_bytes.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/packed/read_header.go b/objectstore/packed/read_header.go
index b0a84f23..d774de7c 100644
--- a/objectstore/packed/read_header.go
+++ b/objectstore/packed/read_header.go
@@ -1,7 +1,7 @@
 package packed
 
 import (
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/objectstore/packed/read_reader.go b/objectstore/packed/read_reader.go
index 8d990433..5f4fa604 100644
--- a/objectstore/packed/read_reader.go
+++ b/objectstore/packed/read_reader.go
@@ -7,7 +7,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/iolimit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
diff --git a/objectstore/packed/read_size.go b/objectstore/packed/read_size.go
index 334d3ebf..3036abcd 100644
--- a/objectstore/packed/read_size.go
+++ b/objectstore/packed/read_size.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
diff --git a/objectstore/packed/read_test.go b/objectstore/packed/read_test.go
index 2f6b4979..f672f233 100644
--- a/objectstore/packed/read_test.go
+++ b/objectstore/packed/read_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 	"codeberg.org/lindenii/furgit/objectstore/packed"
 )
diff --git a/objectstore/packed/store.go b/objectstore/packed/store.go
index fc3f57d4..41a4614b 100644
--- a/objectstore/packed/store.go
+++ b/objectstore/packed/store.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 )
 
diff --git a/objectstore/packed/store_lookup.go b/objectstore/packed/store_lookup.go
index 4a6bfc9f..78a54c07 100644
--- a/objectstore/packed/store_lookup.go
+++ b/objectstore/packed/store_lookup.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"errors"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/objectstore"
 )