Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2023-05-10 15:44:05 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2023-05-10 15:49:46 +0300
commitdd2cf97a144b73053da370e97cc7581a81bdc527 (patch)
tree3a20798f8f7c85823b4466d007c8070ccfb4d84c /internal/git2go
parent46ee0248c36241d856710030958fa5e1e04b179e (diff)
go: Bump module version from v15 to v16
We're about to release Gitaly v16.0. As we've landed a bunch of previously announced removals it's thus time to bump our Go module version from v15 to v16.
Diffstat (limited to 'internal/git2go')
-rw-r--r--internal/git2go/apply.go4
-rw-r--r--internal/git2go/apply_test.go12
-rw-r--r--internal/git2go/cherry_pick.go4
-rw-r--r--internal/git2go/commit.go8
-rw-r--r--internal/git2go/commit_test.go12
-rw-r--r--internal/git2go/conflicts.go2
-rw-r--r--internal/git2go/executor.go16
-rw-r--r--internal/git2go/featureflags_test.go14
-rw-r--r--internal/git2go/merge.go2
-rw-r--r--internal/git2go/rebase.go4
-rw-r--r--internal/git2go/resolve_conflicts.go4
-rw-r--r--internal/git2go/revert.go4
-rw-r--r--internal/git2go/submodule.go2
13 files changed, 44 insertions, 44 deletions
diff --git a/internal/git2go/apply.go b/internal/git2go/apply.go
index 5c2b70da2..b1689a95d 100644
--- a/internal/git2go/apply.go
+++ b/internal/git2go/apply.go
@@ -6,8 +6,8 @@ import (
"fmt"
"io"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
// ErrMergeConflict is returned when there is a merge conflict.
diff --git a/internal/git2go/apply_test.go b/internal/git2go/apply_test.go
index b841a3ec0..338761201 100644
--- a/internal/git2go/apply_test.go
+++ b/internal/git2go/apply_test.go
@@ -8,12 +8,12 @@ import (
"testing"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
- "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config"
- "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
- "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
)
func TestExecutor_Apply(t *testing.T) {
diff --git a/internal/git2go/cherry_pick.go b/internal/git2go/cherry_pick.go
index 7e954f50e..dabcd48a1 100644
--- a/internal/git2go/cherry_pick.go
+++ b/internal/git2go/cherry_pick.go
@@ -4,8 +4,8 @@ import (
"context"
"time"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
// CherryPickCommand contains parameters to perform a cherry-pick.
diff --git a/internal/git2go/commit.go b/internal/git2go/commit.go
index fd14b6d45..8dda50164 100644
--- a/internal/git2go/commit.go
+++ b/internal/git2go/commit.go
@@ -5,10 +5,10 @@ import (
"errors"
"fmt"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
- "gitlab.com/gitlab-org/gitaly/v15/internal/structerr"
- "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
+ "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
)
// UnknownIndexError is an unspecified error that was produced by performing an invalid operation on the index.
diff --git a/internal/git2go/commit_test.go b/internal/git2go/commit_test.go
index 264416ac9..a34c64d8b 100644
--- a/internal/git2go/commit_test.go
+++ b/internal/git2go/commit_test.go
@@ -14,12 +14,12 @@ import (
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
- "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config"
- "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
- "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
)
func TestMain(m *testing.M) {
diff --git a/internal/git2go/conflicts.go b/internal/git2go/conflicts.go
index 8dd6c9986..b7018f0ee 100644
--- a/internal/git2go/conflicts.go
+++ b/internal/git2go/conflicts.go
@@ -7,7 +7,7 @@ import (
"errors"
"fmt"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
diff --git a/internal/git2go/executor.go b/internal/git2go/executor.go
index b97a9f3b0..dea316d95 100644
--- a/internal/git2go/executor.go
+++ b/internal/git2go/executor.go
@@ -9,14 +9,14 @@ import (
"io"
"strings"
- "gitlab.com/gitlab-org/gitaly/v15/internal/command"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/alternates"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
- "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config"
- "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/storage"
- glog "gitlab.com/gitlab-org/gitaly/v15/internal/log"
- "gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/command"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/alternates"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
+ glog "gitlab.com/gitlab-org/gitaly/v16/internal/log"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag"
"gitlab.com/gitlab-org/labkit/correlation"
)
diff --git a/internal/git2go/featureflags_test.go b/internal/git2go/featureflags_test.go
index d4b89cf00..9e71539e1 100644
--- a/internal/git2go/featureflags_test.go
+++ b/internal/git2go/featureflags_test.go
@@ -8,13 +8,13 @@ import (
"testing"
"github.com/stretchr/testify/require"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
- "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config"
- "gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
- "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
- "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
)
func (b *Executor) FeatureFlags(ctx context.Context, repo repository.GitRepo) ([]FeatureFlag, error) {
diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go
index 8669a18eb..01061eeec 100644
--- a/internal/git2go/merge.go
+++ b/internal/git2go/merge.go
@@ -6,7 +6,7 @@ import (
"fmt"
"time"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
const (
diff --git a/internal/git2go/rebase.go b/internal/git2go/rebase.go
index 8b041dadb..a07657473 100644
--- a/internal/git2go/rebase.go
+++ b/internal/git2go/rebase.go
@@ -3,8 +3,8 @@ package git2go
import (
"context"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
// RebaseCommand contains parameters to rebase a branch.
diff --git a/internal/git2go/resolve_conflicts.go b/internal/git2go/resolve_conflicts.go
index cd1ad0d03..1ba19fc81 100644
--- a/internal/git2go/resolve_conflicts.go
+++ b/internal/git2go/resolve_conflicts.go
@@ -6,8 +6,8 @@ import (
"encoding/gob"
"fmt"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/conflict"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/conflict"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
// ResolveCommand contains arguments to perform a merge commit and resolve any
diff --git a/internal/git2go/revert.go b/internal/git2go/revert.go
index 4c42e706d..d3a545729 100644
--- a/internal/git2go/revert.go
+++ b/internal/git2go/revert.go
@@ -4,8 +4,8 @@ import (
"context"
"time"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
// RevertCommand contains parameters required to execute a revert via gitaly-git2go.
diff --git a/internal/git2go/submodule.go b/internal/git2go/submodule.go
index ce4aad37f..f0fb54e90 100644
--- a/internal/git2go/submodule.go
+++ b/internal/git2go/submodule.go
@@ -7,7 +7,7 @@ import (
"fmt"
"time"
- "gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
+ "gitlab.com/gitlab-org/gitaly/v16/internal/git/repository"
)
// Error strings present in the legacy Ruby implementation