*: objectid -> object/id

28 files changed, 28 insertions, 28 deletions

diff --git a/object/resolve/exact_blob.go b/object/resolve/exact_blob.go
index 3b880909..6447f06e 100644
--- a/object/resolve/exact_blob.go
+++ b/object/resolve/exact_blob.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // ExactBlob reads, parses, and wraps the blob at id.
diff --git a/object/resolve/exact_blob_reader.go b/object/resolve/exact_blob_reader.go
index 5524dfcb..5a702888 100644
--- a/object/resolve/exact_blob_reader.go
+++ b/object/resolve/exact_blob_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/exact_commit.go b/object/resolve/exact_commit.go
index 0d209253..67538d79 100644
--- a/object/resolve/exact_commit.go
+++ b/object/resolve/exact_commit.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // ExactCommit reads, parses, and wraps the commit at id.
diff --git a/object/resolve/exact_commit_reader.go b/object/resolve/exact_commit_reader.go
index dc8a563a..6c05b016 100644
--- a/object/resolve/exact_commit_reader.go
+++ b/object/resolve/exact_commit_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/exact_object.go b/object/resolve/exact_object.go
index 4fac07cd..48a88c5b 100644
--- a/object/resolve/exact_object.go
+++ b/object/resolve/exact_object.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // ExactObject reads, parses, and wraps the object at id without constraining
diff --git a/object/resolve/exact_reader.go b/object/resolve/exact_reader.go
index 0e7a6112..cf181038 100644
--- a/object/resolve/exact_reader.go
+++ b/object/resolve/exact_reader.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/exact_tag.go b/object/resolve/exact_tag.go
index 7af7cb3b..89706b48 100644
--- a/object/resolve/exact_tag.go
+++ b/object/resolve/exact_tag.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // ExactTag reads, parses, and wraps the tag at id.
diff --git a/object/resolve/exact_tag_reader.go b/object/resolve/exact_tag_reader.go
index d673237f..e69441d5 100644
--- a/object/resolve/exact_tag_reader.go
+++ b/object/resolve/exact_tag_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/exact_tree.go b/object/resolve/exact_tree.go
index b4271b52..9dbd8df8 100644
--- a/object/resolve/exact_tree.go
+++ b/object/resolve/exact_tree.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // ExactTree reads, parses, and wraps the tree at id.
diff --git a/object/resolve/exact_tree_reader.go b/object/resolve/exact_tree_reader.go
index b4e34dd2..8d9ec821 100644
--- a/object/resolve/exact_tree_reader.go
+++ b/object/resolve/exact_tree_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/object_parse.go b/object/resolve/object_parse.go
index bc814988..8e8d8bde 100644
--- a/object/resolve/object_parse.go
+++ b/object/resolve/object_parse.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"codeberg.org/lindenii/furgit/object"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/path.go b/object/resolve/path.go
index a522d823..1f865403 100644
--- a/object/resolve/path.go
+++ b/object/resolve/path.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"codeberg.org/lindenii/furgit/object"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PathEmptyError indicates that Path received no segments.
diff --git a/object/resolve/peel_to_blob.go b/object/resolve/peel_to_blob.go
index 59cfcba5..0e727f6f 100644
--- a/object/resolve/peel_to_blob.go
+++ b/object/resolve/peel_to_blob.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToBlob peels tags until it reaches a blob.
diff --git a/object/resolve/peel_to_blob_id.go b/object/resolve/peel_to_blob_id.go
index 3fcd9bc8..c3467cf2 100644
--- a/object/resolve/peel_to_blob_id.go
+++ b/object/resolve/peel_to_blob_id.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/peel_to_blob_reader.go b/object/resolve/peel_to_blob_reader.go
index 7ea9f3af..d3bc7f49 100644
--- a/object/resolve/peel_to_blob_reader.go
+++ b/object/resolve/peel_to_blob_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToBlobReader returns a reader for the content of the peeled blob at id,
diff --git a/object/resolve/peel_to_commit.go b/object/resolve/peel_to_commit.go
index 566fa294..d548c48f 100644
--- a/object/resolve/peel_to_commit.go
+++ b/object/resolve/peel_to_commit.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToCommit peels tags until it reaches a commit.
diff --git a/object/resolve/peel_to_commit_id.go b/object/resolve/peel_to_commit_id.go
index 5d02ec1a..972823ce 100644
--- a/object/resolve/peel_to_commit_id.go
+++ b/object/resolve/peel_to_commit_id.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/peel_to_commit_reader.go b/object/resolve/peel_to_commit_reader.go
index ab17fe67..6972eff3 100644
--- a/object/resolve/peel_to_commit_reader.go
+++ b/object/resolve/peel_to_commit_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToCommitReader returns a reader for the content of the peeled commit at
diff --git a/object/resolve/peel_to_tag.go b/object/resolve/peel_to_tag.go
index 49fe9108..97a5f2fc 100644
--- a/object/resolve/peel_to_tag.go
+++ b/object/resolve/peel_to_tag.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToTag returns the tag at id without further peeling.
diff --git a/object/resolve/peel_to_tag_id.go b/object/resolve/peel_to_tag_id.go
index 8574aaa2..275ef561 100644
--- a/object/resolve/peel_to_tag_id.go
+++ b/object/resolve/peel_to_tag_id.go
@@ -1,6 +1,6 @@
 package resolve
 
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
 
 // PeelToTagID returns id unchanged.
 func (r *Resolver) PeelToTagID(id objectid.ObjectID) (objectid.ObjectID, error) {
diff --git a/object/resolve/peel_to_tag_reader.go b/object/resolve/peel_to_tag_reader.go
index d34ff7ad..77279511 100644
--- a/object/resolve/peel_to_tag_reader.go
+++ b/object/resolve/peel_to_tag_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToTagReader returns a reader for the content of the tag at id,
diff --git a/object/resolve/peel_to_tree.go b/object/resolve/peel_to_tree.go
index bb5d2422..e8d60b76 100644
--- a/object/resolve/peel_to_tree.go
+++ b/object/resolve/peel_to_tree.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/stored"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToTree peels tags until it reaches a tree or commit. If it reaches a
diff --git a/object/resolve/peel_to_tree_id.go b/object/resolve/peel_to_tree_id.go
index 79730d4f..bacee65e 100644
--- a/object/resolve/peel_to_tree_id.go
+++ b/object/resolve/peel_to_tree_id.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/resolve/peel_to_tree_reader.go b/object/resolve/peel_to_tree_reader.go
index 1f867883..515224ed 100644
--- a/object/resolve/peel_to_tree_reader.go
+++ b/object/resolve/peel_to_tree_reader.go
@@ -3,7 +3,7 @@ package resolve
 import (
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // PeelToTreeReader returns a reader for the content of the peeled tree at id,
diff --git a/object/resolve/treefs.go b/object/resolve/treefs.go
index eda8c7fa..de5d588a 100644
--- a/object/resolve/treefs.go
+++ b/object/resolve/treefs.go
@@ -4,7 +4,7 @@ import (
 	"io/fs"
 
 	"codeberg.org/lindenii/furgit/object"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // TreeFS exposes one Git tree as an fs.FS.
diff --git a/object/resolve/treefs_entry.go b/object/resolve/treefs_entry.go
index af9760ca..b37ac0a0 100644
--- a/object/resolve/treefs_entry.go
+++ b/object/resolve/treefs_entry.go
@@ -6,7 +6,7 @@ import (
 	"io/fs"
 
 	"codeberg.org/lindenii/furgit/object"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 func (treeFS *TreeFS) resolvePath(op treeFSOp, name string) (treeEntryValue, error) {
diff --git a/object/resolve/treefs_new.go b/object/resolve/treefs_new.go
index 9a48a02e..9f5fe77d 100644
--- a/object/resolve/treefs_new.go
+++ b/object/resolve/treefs_new.go
@@ -1,6 +1,6 @@
 package resolve
 
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
 
 // TreeFS returns a new filesystem view rooted at root, which may be any
 // tree-ish object accepted by PeelToTreeID.
diff --git a/object/resolve/treefs_test.go b/object/resolve/treefs_test.go
index 64cd1778..c337a7cd 100644
--- a/object/resolve/treefs_test.go
+++ b/object/resolve/treefs_test.go
@@ -8,7 +8,7 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	"codeberg.org/lindenii/furgit/object"
 	"codeberg.org/lindenii/furgit/object/resolve"
-	"codeberg.org/lindenii/furgit/objectid"
+	objectid "codeberg.org/lindenii/furgit/object/id"
 	"codeberg.org/lindenii/furgit/repository"
 )