diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2023-09-19 17:05:10 +0300 |
|---|---|---|
| committer | Christian Couder <chriscool@tuxfamily.org> | 2023-09-19 17:05:10 +0300 |
| commit | cd32abfa498d12038240c1868a42df7ee3344a95 (patch) | |
| tree | 9dc460c1becccf873f31a7bd70496a921c5b40be | |
| parent | fe0a04858c9a5172379077343b16e1fd2e017903 (diff) | |
| parent | 1f698c8ee4725c7040254040934c8ecc2fb8eff0 (diff) | |
Merge branch 'kn-git-242-feature-flag' into 'master'
featureflag: Remove the `GitV242` flag
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6378
Merged-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: Christian Couder <chriscool@tuxfamily.org>
Co-authored-by: Karthik Nayak <knayak@gitlab.com>
| -rw-r--r-- | internal/featureflag/ff_git_v242.go | 9 | ||||
| -rw-r--r-- | internal/git/execution_environment.go | 3 | ||||
| -rw-r--r-- | internal/testhelper/testhelper.go | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/internal/featureflag/ff_git_v242.go b/internal/featureflag/ff_git_v242.go deleted file mode 100644 index 18c983201..000000000 --- a/internal/featureflag/ff_git_v242.go +++ /dev/null @@ -1,9 +0,0 @@ -package featureflag - -// GitV242 enables the use of Git v2.42. -var GitV242 = NewFeatureFlag( - "git_v242", - "v16.4.0", - "https://gitlab.com/gitlab-org/gitaly/-/issues/5539", - true, -) diff --git a/internal/git/execution_environment.go b/internal/git/execution_environment.go index c4f7608e5..9f982c30b 100644 --- a/internal/git/execution_environment.go +++ b/internal/git/execution_environment.go @@ -26,9 +26,6 @@ var ( defaultExecutionEnvironmentConstructors = []ExecutionEnvironmentConstructor{ BundledGitEnvironmentConstructor{ Suffix: "-v2.42", - FeatureFlags: []featureflag.FeatureFlag{ - featureflag.GitV242, - }, }, BundledGitEnvironmentConstructor{ diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 4ee0e5f19..60ea38545 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -255,8 +255,6 @@ func ContextWithoutCancel(opts ...ContextOpt) context.Context { // Randomly enable mailmap ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.MailmapOptions, rand.Int()%2 == 0) - // Randomly enable either Git v2.41 or 2.42. - ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV242, rand.Int()%2 == 0) // This feature flag sits in `command.Wait()` and is thus getting executed in a ton of tests. ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.CommandCloseStdout, rand.Int()%2 == 0) |