diff options
Diffstat (limited to 'internal/git')
-rw-r--r-- | internal/git/log/tag_test.go | 5 | ||||
-rw-r--r-- | internal/git/objectpool/link.go | 3 | ||||
-rw-r--r-- | internal/git/protocol.go | 1 | ||||
-rw-r--r-- | internal/git/protocol_test.go | 1 | ||||
-rw-r--r-- | internal/git/remote/remote_test.go | 3 | ||||
-rw-r--r-- | internal/git/updateref/updateref_test.go | 3 |
6 files changed, 5 insertions, 11 deletions
diff --git a/internal/git/log/tag_test.go b/internal/git/log/tag_test.go index 92750d693..2aadb8511 100644 --- a/internal/git/log/tag_test.go +++ b/internal/git/log/tag_test.go @@ -6,11 +6,10 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/gitaly/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/internal/testhelper" ) diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go index 9f062cb0c..534847d10 100644 --- a/internal/git/objectpool/link.go +++ b/internal/git/objectpool/link.go @@ -10,10 +10,9 @@ import ( "path/filepath" "strings" + "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/git/remote" "gitlab.com/gitlab-org/gitaly/internal/git/repository" - - "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) diff --git a/internal/git/protocol.go b/internal/git/protocol.go index 922238d50..ac86873b8 100644 --- a/internal/git/protocol.go +++ b/internal/git/protocol.go @@ -7,7 +7,6 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/config" ) diff --git a/internal/git/protocol_test.go b/internal/git/protocol_test.go index d3d430b95..925a4ff74 100644 --- a/internal/git/protocol_test.go +++ b/internal/git/protocol_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/config" ) diff --git a/internal/git/remote/remote_test.go b/internal/git/remote/remote_test.go index af4c56a9e..c695bd041 100644 --- a/internal/git/remote/remote_test.go +++ b/internal/git/remote/remote_test.go @@ -3,9 +3,8 @@ package remote import ( "testing" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/internal/testhelper" ) diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go index f89f590ca..ceb581a1f 100644 --- a/internal/git/updateref/updateref_test.go +++ b/internal/git/updateref/updateref_test.go @@ -7,10 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/internal/git/log" "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) func setup(t *testing.T) (context.Context, *gitalypb.Repository, string, func()) { |