aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/peel/peel.go2
-rw-r--r--internal/testgit/algorithms.go2
-rw-r--r--internal/testgit/repo.go2
-rw-r--r--internal/testgit/repo_cat_file.go2
-rw-r--r--internal/testgit/repo_commit_tree.go2
-rw-r--r--internal/testgit/repo_commit_tree_env.go2
-rw-r--r--internal/testgit/repo_from_fixture.go2
-rw-r--r--internal/testgit/repo_hash_object.go2
-rw-r--r--internal/testgit/repo_make_commit.go2
-rw-r--r--internal/testgit/repo_make_many_objects_history.go2
-rw-r--r--internal/testgit/repo_make_single_file_tree.go2
-rw-r--r--internal/testgit/repo_mktree.go2
-rw-r--r--internal/testgit/repo_new.go2
-rw-r--r--internal/testgit/repo_properties.go2
-rw-r--r--internal/testgit/repo_refs.go2
-rw-r--r--internal/testgit/repo_remove_loose_object.go2
-rw-r--r--internal/testgit/repo_rev_list.go2
-rw-r--r--internal/testgit/repo_rev_parse.go2
-rw-r--r--internal/testgit/repo_tag_annotated.go2
19 files changed, 19 insertions, 19 deletions
diff --git a/internal/peel/peel.go b/internal/peel/peel.go
index c50b3d7b..2f27d410 100644
--- a/internal/peel/peel.go
+++ b/internal/peel/peel.go
@@ -6,7 +6,7 @@ import (
giterrors "codeberg.org/lindenii/furgit/errors"
"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/internal/testgit/algorithms.go b/internal/testgit/algorithms.go
index 5534aad0..aea4dc12 100644
--- a/internal/testgit/algorithms.go
+++ b/internal/testgit/algorithms.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// ForEachAlgorithm runs a subtest for every supported algorithm.
diff --git a/internal/testgit/repo.go b/internal/testgit/repo.go
index 3d0267d2..72831bd6 100644
--- a/internal/testgit/repo.go
+++ b/internal/testgit/repo.go
@@ -1,7 +1,7 @@
// Package testgit provides helpers for integration tests with upstream git(1).
package testgit
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
// TestRepo is a temporary git repository harness for integration tests.
type TestRepo struct {
diff --git a/internal/testgit/repo_cat_file.go b/internal/testgit/repo_cat_file.go
index 1325cf6f..7dbd2c43 100644
--- a/internal/testgit/repo_cat_file.go
+++ b/internal/testgit/repo_cat_file.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// CatFile returns raw output from git cat-file.
diff --git a/internal/testgit/repo_commit_tree.go b/internal/testgit/repo_commit_tree.go
index 5eee21ba..3a5a75ac 100644
--- a/internal/testgit/repo_commit_tree.go
+++ b/internal/testgit/repo_commit_tree.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// CommitTree creates a commit from a tree and message, optionally with parents.
diff --git a/internal/testgit/repo_commit_tree_env.go b/internal/testgit/repo_commit_tree_env.go
index ee949b5c..fbddf26f 100644
--- a/internal/testgit/repo_commit_tree_env.go
+++ b/internal/testgit/repo_commit_tree_env.go
@@ -5,7 +5,7 @@ import (
"strings"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// CommitTreeWithEnv creates one commit from a tree and message, optionally with
diff --git a/internal/testgit/repo_from_fixture.go b/internal/testgit/repo_from_fixture.go
index 4a022bc5..632de12a 100644
--- a/internal/testgit/repo_from_fixture.go
+++ b/internal/testgit/repo_from_fixture.go
@@ -5,7 +5,7 @@ import (
"os"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// NewRepoFromFixture copies one existing repository fixture into a temp dir.
diff --git a/internal/testgit/repo_hash_object.go b/internal/testgit/repo_hash_object.go
index bc2def72..75f1a7ab 100644
--- a/internal/testgit/repo_hash_object.go
+++ b/internal/testgit/repo_hash_object.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// HashObject hashes and writes an object and returns its object ID.
diff --git a/internal/testgit/repo_make_commit.go b/internal/testgit/repo_make_commit.go
index c8bdc428..32a063f7 100644
--- a/internal/testgit/repo_make_commit.go
+++ b/internal/testgit/repo_make_commit.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// MakeCommit creates a commit over a single-file tree and returns (blobID, treeID, commitID).
diff --git a/internal/testgit/repo_make_many_objects_history.go b/internal/testgit/repo_make_many_objects_history.go
index 970d1992..f71ead2c 100644
--- a/internal/testgit/repo_make_many_objects_history.go
+++ b/internal/testgit/repo_make_many_objects_history.go
@@ -5,7 +5,7 @@ import (
"strings"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
const (
diff --git a/internal/testgit/repo_make_single_file_tree.go b/internal/testgit/repo_make_single_file_tree.go
index e7a235a7..ace98e8a 100644
--- a/internal/testgit/repo_make_single_file_tree.go
+++ b/internal/testgit/repo_make_single_file_tree.go
@@ -4,7 +4,7 @@ import (
"fmt"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// MakeSingleFileTree writes one blob and one tree entry for it and returns (blobID, treeID).
diff --git a/internal/testgit/repo_mktree.go b/internal/testgit/repo_mktree.go
index 565a0083..893d211e 100644
--- a/internal/testgit/repo_mktree.go
+++ b/internal/testgit/repo_mktree.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// Mktree creates a tree from textual mktree input and returns its ID.
diff --git a/internal/testgit/repo_new.go b/internal/testgit/repo_new.go
index 4ae80393..b7c9968b 100644
--- a/internal/testgit/repo_new.go
+++ b/internal/testgit/repo_new.go
@@ -4,7 +4,7 @@ import (
"os"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// RepoOptions controls git-init options for test repositories.
diff --git a/internal/testgit/repo_properties.go b/internal/testgit/repo_properties.go
index b731a6e4..d46e9030 100644
--- a/internal/testgit/repo_properties.go
+++ b/internal/testgit/repo_properties.go
@@ -1,6 +1,6 @@
package testgit
-import "codeberg.org/lindenii/furgit/objectid"
+import objectid "codeberg.org/lindenii/furgit/object/id"
// Algorithm returns the object ID algorithm configured for this repository.
func (testRepo *TestRepo) Algorithm() objectid.Algorithm {
diff --git a/internal/testgit/repo_refs.go b/internal/testgit/repo_refs.go
index 66e08561..a92e1658 100644
--- a/internal/testgit/repo_refs.go
+++ b/internal/testgit/repo_refs.go
@@ -4,7 +4,7 @@ import (
"strings"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// UpdateRef updates a ref to point at id.
diff --git a/internal/testgit/repo_remove_loose_object.go b/internal/testgit/repo_remove_loose_object.go
index ec3d8c2d..345d9db7 100644
--- a/internal/testgit/repo_remove_loose_object.go
+++ b/internal/testgit/repo_remove_loose_object.go
@@ -4,7 +4,7 @@ import (
"fmt"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// RemoveLooseObject removes one loose object file from the repository.
diff --git a/internal/testgit/repo_rev_list.go b/internal/testgit/repo_rev_list.go
index d3adf5a0..6b0c4f76 100644
--- a/internal/testgit/repo_rev_list.go
+++ b/internal/testgit/repo_rev_list.go
@@ -4,7 +4,7 @@ import (
"strings"
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// RevList runs "git rev-list" with args and parses one object ID per line.
diff --git a/internal/testgit/repo_rev_parse.go b/internal/testgit/repo_rev_parse.go
index 3bee6108..fcdee605 100644
--- a/internal/testgit/repo_rev_parse.go
+++ b/internal/testgit/repo_rev_parse.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// RevParse resolves rev expressions to object IDs.
diff --git a/internal/testgit/repo_tag_annotated.go b/internal/testgit/repo_tag_annotated.go
index 56bd6a0c..cf6e9b3d 100644
--- a/internal/testgit/repo_tag_annotated.go
+++ b/internal/testgit/repo_tag_annotated.go
@@ -3,7 +3,7 @@ package testgit
import (
"testing"
- "codeberg.org/lindenii/furgit/objectid"
+ objectid "codeberg.org/lindenii/furgit/object/id"
)
// TagAnnotated creates an annotated tag object and returns the resulting tag object ID.