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:
authorJohn Cai <jcai@gitlab.com>2023-06-08 22:46:12 +0300
committerJohn Cai <jcai@gitlab.com>2023-06-21 22:02:18 +0300
commit607d8991170f4094260b24c957468801f1c0e0cf (patch)
tree1e335e961d293ae748b0f3f1c1a96c38a9e36a22
parentffe58a872e23fb61c0804662d2090b5a17b0e551 (diff)
Add MergeToRefInGit feature flag
This feature flag will be used to gate the non git2go implementation of MergeToRef.
-rw-r--r--internal/featureflag/ff_merge_to_ref_git.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/internal/featureflag/ff_merge_to_ref_git.go b/internal/featureflag/ff_merge_to_ref_git.go
new file mode 100644
index 000000000..c641619d1
--- /dev/null
+++ b/internal/featureflag/ff_merge_to_ref_git.go
@@ -0,0 +1,10 @@
+package featureflag
+
+// MergeToRefWithGit will enable the UserMergeToRef RPC to use
+// git-merge-tree instead of git2go
+var MergeToRefWithGit = NewFeatureFlag(
+ "merge_to_ref_with_git",
+ "v16.2.0",
+ "https://gitlab.com/gitlab-org/gitaly/-/issues/5401",
+ false,
+)