aboutsummaryrefslogtreecommitdiff
path: root/commitquery
diff options
context:
space:
mode:
Diffstat (limited to 'commitquery')
-rw-r--r--commitquery/ancestor.go2
-rw-r--r--commitquery/ancestor_integration_test.go2
-rw-r--r--commitquery/ancestor_unit_test.go2
-rw-r--r--commitquery/commit.go2
-rw-r--r--commitquery/compare.go2
-rw-r--r--commitquery/context.go2
-rw-r--r--commitquery/generation.go2
-rw-r--r--commitquery/merge_bases.go2
-rw-r--r--commitquery/mergebase_integration_test.go2
-rw-r--r--commitquery/mergebase_unit_test.go2
-rw-r--r--commitquery/node.go2
-rw-r--r--commitquery/oid.go2
-rw-r--r--commitquery/parent.go2
13 files changed, 13 insertions, 13 deletions
diff --git a/commitquery/ancestor.go b/commitquery/ancestor.go
index 671ea460..4f182a95 100644
--- a/commitquery/ancestor.go
+++ b/commitquery/ancestor.go
@@ -1,6 +1,6 @@
package commitquery
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
// IsAncestor reports whether ancestor is reachable from descendant through
// commit parent edges.
diff --git a/commitquery/ancestor_integration_test.go b/commitquery/ancestor_integration_test.go
index a25697aa..8db680e6 100644
--- a/commitquery/ancestor_integration_test.go
+++ b/commitquery/ancestor_integration_test.go
@@ -7,7 +7,7 @@ import (
"codeberg.org/lindenii/furgit/commitquery"
giterrors "codeberg.org/lindenii/furgit/errors"
"codeberg.org/lindenii/furgit/internal/testgit"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
func TestIsMatchesGitMergeBase(t *testing.T) {
diff --git a/commitquery/ancestor_unit_test.go b/commitquery/ancestor_unit_test.go
index b7e52253..20a81313 100644
--- a/commitquery/ancestor_unit_test.go
+++ b/commitquery/ancestor_unit_test.go
@@ -8,7 +8,7 @@ import (
giterrors "codeberg.org/lindenii/furgit/errors"
"codeberg.org/lindenii/furgit/internal/testgit"
"codeberg.org/lindenii/furgit/object"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
"codeberg.org/lindenii/furgit/objectstore/memory"
objecttype "codeberg.org/lindenii/furgit/object/type"
diff --git a/commitquery/commit.go b/commitquery/commit.go
index f4709270..8e60e3fd 100644
--- a/commitquery/commit.go
+++ b/commitquery/commit.go
@@ -2,7 +2,7 @@ package commitquery
import (
commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// commitData stores the metadata needed by commit-domain queries.
diff --git a/commitquery/compare.go b/commitquery/compare.go
index f64b5b3f..21dc5eb9 100644
--- a/commitquery/compare.go
+++ b/commitquery/compare.go
@@ -1,6 +1,6 @@
package commitquery
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
// Compare compares two internal nodes using merge-base queue ordering.
func (query *Query) compare(left, right nodeIndex) int {
diff --git a/commitquery/context.go b/commitquery/context.go
index 8e19138e..80b9ed33 100644
--- a/commitquery/context.go
+++ b/commitquery/context.go
@@ -3,7 +3,7 @@ package commitquery
import (
commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
"codeberg.org/lindenii/furgit/objectstore"
)
diff --git a/commitquery/generation.go b/commitquery/generation.go
index 05228b29..39ddd2e9 100644
--- a/commitquery/generation.go
+++ b/commitquery/generation.go
@@ -3,7 +3,7 @@ package commitquery
import (
"math"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// EffectiveGeneration returns one node's generation value.
diff --git a/commitquery/merge_bases.go b/commitquery/merge_bases.go
index c63bb82f..b7021814 100644
--- a/commitquery/merge_bases.go
+++ b/commitquery/merge_bases.go
@@ -3,7 +3,7 @@ package commitquery
import (
"slices"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// MergeBases reports all merge bases in Git's merge-base --all order.
diff --git a/commitquery/mergebase_integration_test.go b/commitquery/mergebase_integration_test.go
index 30477454..f19468eb 100644
--- a/commitquery/mergebase_integration_test.go
+++ b/commitquery/mergebase_integration_test.go
@@ -8,7 +8,7 @@ import (
"codeberg.org/lindenii/furgit/commitquery"
"codeberg.org/lindenii/furgit/internal/testgit"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
func TestQueryMatchesGitMergeBaseAll(t *testing.T) {
diff --git a/commitquery/mergebase_unit_test.go b/commitquery/mergebase_unit_test.go
index 7f9c0b82..bedd936d 100644
--- a/commitquery/mergebase_unit_test.go
+++ b/commitquery/mergebase_unit_test.go
@@ -11,7 +11,7 @@ import (
giterrors "codeberg.org/lindenii/furgit/errors"
"codeberg.org/lindenii/furgit/internal/testgit"
"codeberg.org/lindenii/furgit/object"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
"codeberg.org/lindenii/furgit/objectstore/memory"
objecttype "codeberg.org/lindenii/furgit/object/type"
)
diff --git a/commitquery/node.go b/commitquery/node.go
index cd357631..5b1c7142 100644
--- a/commitquery/node.go
+++ b/commitquery/node.go
@@ -2,7 +2,7 @@ package commitquery
import (
commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// nodeIndex identifies one internal query node.
diff --git a/commitquery/oid.go b/commitquery/oid.go
index e83d350c..c6c8d23a 100644
--- a/commitquery/oid.go
+++ b/commitquery/oid.go
@@ -7,7 +7,7 @@ import (
giterrors "codeberg.org/lindenii/furgit/errors"
"codeberg.org/lindenii/furgit/internal/peel"
"codeberg.org/lindenii/furgit/object"
- "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/commitquery/parent.go b/commitquery/parent.go
index 1c59e102..41877975 100644
--- a/commitquery/parent.go
+++ b/commitquery/parent.go
@@ -2,7 +2,7 @@ package commitquery
import (
commitgraphread "codeberg.org/lindenii/furgit/commitgraph/read"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// parentRef references one commit parent.