diff options
| author | Toon Claes <toon@gitlab.com> | 2024-01-19 14:18:04 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2024-01-19 14:22:25 +0300 |
| commit | 3e262864c8830120d83f35d029f88b03b1a9df03 (patch) | |
| tree | d0a938915e89c498e1869326578b997e10f142bf | |
| parent | f87a9ac8bd9ad76807d92660b91002b7dffd35d9 (diff) | |
git: Use Git version 2.43 only
Remove the feature flag to toggle the use of v2.43, enable it by
default, and remove the use of v2.42.
Label: maintenance::dependency
| -rw-r--r-- | internal/featureflag/ff_git_v243.go | 9 | ||||
| -rw-r--r-- | internal/git/execution_environment.go | 6 | ||||
| -rw-r--r-- | internal/testhelper/testhelper.go | 2 |
3 files changed, 0 insertions, 17 deletions
diff --git a/internal/featureflag/ff_git_v243.go b/internal/featureflag/ff_git_v243.go deleted file mode 100644 index 313809990..000000000 --- a/internal/featureflag/ff_git_v243.go +++ /dev/null @@ -1,9 +0,0 @@ -package featureflag - -// GitV243 enables the use of Git version 2.43. -var GitV243 = NewFeatureFlag( - "git_v243", - "v16.7.0", - "https://gitlab.com/gitlab-org/gitaly/-/issues/5739", - false, -) diff --git a/internal/git/execution_environment.go b/internal/git/execution_environment.go index dd9cd0844..9f5fbf56f 100644 --- a/internal/git/execution_environment.go +++ b/internal/git/execution_environment.go @@ -26,12 +26,6 @@ var ( defaultExecutionEnvironmentConstructors = []ExecutionEnvironmentConstructor{ BundledGitEnvironmentConstructor{ Suffix: "-v2.43", - FeatureFlags: []featureflag.FeatureFlag{ - featureflag.GitV243, - }, - }, - BundledGitEnvironmentConstructor{ - Suffix: "-v2.42", }, DistributedGitEnvironmentConstructor{}, } diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 39f371de3..452c5b000 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -260,8 +260,6 @@ func ContextWithoutCancel(opts ...ContextOpt) context.Context { ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.UseResizableSemaphoreInConcurrencyLimiter, rand.Int()%2 == 0) // Randomly enable ExecCommandDirectlyInCgroup. ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.ExecCommandDirectlyInCgroup, rand.Int()%2 == 0) - // Randomly enable newer Git version. - ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV243, rand.Int()%2 == 0) // Disable LogGitTraces ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.LogGitTraces, false) |