diff options
| author | Karthik Nayak <knayak@gitlab.com> | 2023-05-05 21:57:21 +0300 |
|---|---|---|
| committer | Karthik Nayak <knayak@gitlab.com> | 2023-05-31 14:56:59 +0300 |
| commit | 90affdf2a637a921ce4456ce54d85afa9d332451 (patch) | |
| tree | 88aa19559a61028d689a87027ef9ab622fdedf6d | |
| parent | dcf08678c91e0f64f92c6cc9bf8bdb8d8c891be6 (diff) | |
featureflag: Add flag ListConflictFilesMergeTree
Add a new flag `ListConflictFilesMergeTree`, which will be used to
enable the use of git-merge-tree(1) for the ListConflictFiles RPC.
| -rw-r--r-- | internal/featureflag/ff_list_conflict_files_merge_tree.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/internal/featureflag/ff_list_conflict_files_merge_tree.go b/internal/featureflag/ff_list_conflict_files_merge_tree.go new file mode 100644 index 000000000..92caf4263 --- /dev/null +++ b/internal/featureflag/ff_list_conflict_files_merge_tree.go @@ -0,0 +1,10 @@ +package featureflag + +// ListConflictFilesMergeTree enables the usage of git-merge-tree(1) for +// the ListConflictFiles RPC. +var ListConflictFilesMergeTree = NewFeatureFlag( + "list_conflict_files_merge_tree", + "v16.1.0", + "https://gitlab.com/gitlab-org/gitaly/-/issues/5098", + false, +) |