Merge branch 'rs-cherry-pick-revert-dry-run' into 'master'

Support dry-run cherry-picks and reverts

See merge request gitlab-org/gitaly!2382

8 files changed, 334 insertions, 165 deletions

diff --git a/changelogs/unreleased/rs-cherry-pick-revert-dry-run.yml b/changelogs/unreleased/rs-cherry-pick-revert-dry-run.yml
new file mode 100644
index 000000000..18b3632be
--- /dev/null
+++ b/changelogs/unreleased/rs-cherry-pick-revert-dry-run.yml
@@ -0,0 +1,5 @@
+---
+title: Support dry-run cherry-picks and reverts
+merge_request: 2382
+author:
+type: added
diff --git a/internal/service/operations/cherry_pick_test.go b/internal/service/operations/cherry_pick_test.go
index 6bbb68acb..1af9c5974 100644
--- a/internal/service/operations/cherry_pick_test.go
+++ b/internal/service/operations/cherry_pick_test.go
@@ -34,9 +34,11 @@ func TestSuccessfulUserCherryPickRequest(t *testing.T) {
 	cherryPickedCommit, err := log.GetCommit(ctxOuter, testRepo, "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab")
 	require.NoError(t, err)
 
-	testRepoCopy, _, cleanup := testhelper.NewTestRepo(t)
+	testRepoCopy, testRepoCopyPath, cleanup := testhelper.NewTestRepo(t) // read-only repo
 	defer cleanup()
 
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoCopyPath, "branch", destinationBranch, "master")
+
 	testCases := []struct {
 		desc         string
 		request      *gitalypb.UserCherryPickRequest
@@ -90,6 +92,58 @@ func TestSuccessfulUserCherryPickRequest(t *testing.T) {
 			},
 			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
 		},
+		{
+			desc: "branch exists with dry run",
+			request: &gitalypb.UserCherryPickRequest{
+				Repository: testRepoCopy,
+				User:       testhelper.TestUser,
+				Commit:     cherryPickedCommit,
+				BranchName: []byte(destinationBranch),
+				Message:    []byte("Cherry-picking " + cherryPickedCommit.Id),
+				DryRun:     true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{},
+		},
+		{
+			desc: "nonexistent branch + start_repository == repository with dry run",
+			request: &gitalypb.UserCherryPickRequest{
+				Repository:      testRepoCopy,
+				User:            testhelper.TestUser,
+				Commit:          cherryPickedCommit,
+				BranchName:      []byte("to-be-cherry-picked-into-1"),
+				Message:         []byte("Cherry-picking " + cherryPickedCommit.Id),
+				StartBranchName: []byte("master"),
+				DryRun:          true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
+		},
+		{
+			desc: "nonexistent branch + start_repository != repository with dry run",
+			request: &gitalypb.UserCherryPickRequest{
+				Repository:      testRepoCopy,
+				User:            testhelper.TestUser,
+				Commit:          cherryPickedCommit,
+				BranchName:      []byte("to-be-cherry-picked-into-2"),
+				Message:         []byte("Cherry-picking " + cherryPickedCommit.Id),
+				StartRepository: testRepoCopy,
+				StartBranchName: []byte("master"),
+				DryRun:          true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
+		},
+		{
+			desc: "nonexistent branch + empty start_repository with dry run",
+			request: &gitalypb.UserCherryPickRequest{
+				Repository:      testRepoCopy,
+				User:            testhelper.TestUser,
+				Commit:          cherryPickedCommit,
+				BranchName:      []byte("to-be-cherry-picked-into-3"),
+				Message:         []byte("Cherry-picking " + cherryPickedCommit.Id),
+				StartBranchName: []byte("master"),
+				DryRun:          true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
+		},
 	}
 
 	for _, testCase := range testCases {
@@ -100,7 +154,7 @@ func TestSuccessfulUserCherryPickRequest(t *testing.T) {
 			response, err := client.UserCherryPick(ctx, testCase.request)
 			require.NoError(t, err)
 
-			headCommit, err := log.GetCommit(ctx, testRepo, string(testCase.request.BranchName))
+			headCommit, err := log.GetCommit(ctx, testCase.request.Repository, string(testCase.request.BranchName))
 			require.NoError(t, err)
 
 			expectedBranchUpdate := testCase.branchUpdate
@@ -109,8 +163,14 @@ func TestSuccessfulUserCherryPickRequest(t *testing.T) {
 			require.Equal(t, expectedBranchUpdate, response.BranchUpdate)
 			require.Empty(t, response.CreateTreeError)
 			require.Empty(t, response.CreateTreeErrorCode)
-			require.Equal(t, testCase.request.Message, headCommit.Subject)
-			require.Equal(t, masterHeadCommit.Id, headCommit.ParentIds[0])
+
+			if testCase.request.DryRun {
+				require.Equal(t, masterHeadCommit.Subject, headCommit.Subject)
+				require.Equal(t, masterHeadCommit.Id, headCommit.Id)
+			} else {
+				require.Equal(t, testCase.request.Message, headCommit.Subject)
+				require.Equal(t, masterHeadCommit.Id, headCommit.ParentIds[0])
+			}
 		})
 	}
 }
diff --git a/internal/service/operations/revert_test.go b/internal/service/operations/revert_test.go
index 392255087..0a2af6296 100644
--- a/internal/service/operations/revert_test.go
+++ b/internal/service/operations/revert_test.go
@@ -34,9 +34,11 @@ func TestSuccessfulUserRevertRequest(t *testing.T) {
 	revertedCommit, err := log.GetCommit(ctxOuter, testRepo, "d59c60028b053793cecfb4022de34602e1a9218e")
 	require.NoError(t, err)
 
-	testRepoCopy, _, cleanup := testhelper.NewTestRepo(t)
+	testRepoCopy, testRepoCopyPath, cleanup := testhelper.NewTestRepo(t) // read-only repo
 	defer cleanup()
 
+	testhelper.MustRunCommand(t, nil, "git", "-C", testRepoCopyPath, "branch", destinationBranch, "master")
+
 	testCases := []struct {
 		desc         string
 		request      *gitalypb.UserRevertRequest
@@ -90,6 +92,58 @@ func TestSuccessfulUserRevertRequest(t *testing.T) {
 			},
 			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
 		},
+		{
+			desc: "branch exists with dry run",
+			request: &gitalypb.UserRevertRequest{
+				Repository: testRepoCopy,
+				User:       testhelper.TestUser,
+				Commit:     revertedCommit,
+				BranchName: []byte(destinationBranch),
+				Message:    []byte("Reverting " + revertedCommit.Id),
+				DryRun:     true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{},
+		},
+		{
+			desc: "nonexistent branch + start_repository == repository with dry run",
+			request: &gitalypb.UserRevertRequest{
+				Repository:      testRepoCopy,
+				User:            testhelper.TestUser,
+				Commit:          revertedCommit,
+				BranchName:      []byte("to-be-reverted-into-1"),
+				Message:         []byte("Reverting " + revertedCommit.Id),
+				StartBranchName: []byte("master"),
+				DryRun:          true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
+		},
+		{
+			desc: "nonexistent branch + start_repository != repository with dry run",
+			request: &gitalypb.UserRevertRequest{
+				Repository:      testRepoCopy,
+				User:            testhelper.TestUser,
+				Commit:          revertedCommit,
+				BranchName:      []byte("to-be-reverted-into-2"),
+				Message:         []byte("Reverting " + revertedCommit.Id),
+				StartRepository: testRepoCopy,
+				StartBranchName: []byte("master"),
+				DryRun:          true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
+		},
+		{
+			desc: "nonexistent branch + empty start_repository with dry run",
+			request: &gitalypb.UserRevertRequest{
+				Repository:      testRepoCopy,
+				User:            testhelper.TestUser,
+				Commit:          revertedCommit,
+				BranchName:      []byte("to-be-reverted-into-3"),
+				Message:         []byte("Reverting " + revertedCommit.Id),
+				StartBranchName: []byte("master"),
+				DryRun:          true,
+			},
+			branchUpdate: &gitalypb.OperationBranchUpdate{BranchCreated: true},
+		},
 	}
 
 	for _, testCase := range testCases {
@@ -100,7 +154,7 @@ func TestSuccessfulUserRevertRequest(t *testing.T) {
 			response, err := client.UserRevert(ctx, testCase.request)
 			require.NoError(t, err)
 
-			headCommit, err := log.GetCommit(ctx, testRepo, string(testCase.request.BranchName))
+			headCommit, err := log.GetCommit(ctx, testCase.request.Repository, string(testCase.request.BranchName))
 			require.NoError(t, err)
 
 			expectedBranchUpdate := testCase.branchUpdate
@@ -109,8 +163,14 @@ func TestSuccessfulUserRevertRequest(t *testing.T) {
 			require.Equal(t, expectedBranchUpdate, response.BranchUpdate)
 			require.Empty(t, response.CreateTreeError)
 			require.Empty(t, response.CreateTreeErrorCode)
-			require.Equal(t, testCase.request.Message, headCommit.Subject)
-			require.Equal(t, masterHeadCommit.Id, headCommit.ParentIds[0])
+
+			if testCase.request.DryRun {
+				require.Equal(t, masterHeadCommit.Subject, headCommit.Subject)
+				require.Equal(t, masterHeadCommit.Id, headCommit.Id)
+			} else {
+				require.Equal(t, testCase.request.Message, headCommit.Subject)
+				require.Equal(t, masterHeadCommit.Id, headCommit.ParentIds[0])
+			}
 		})
 	}
 }
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index f32b0bfa9..d71383d22 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -1109,6 +1109,7 @@ type UserCherryPickRequest struct {
 	Message              []byte      `protobuf:"bytes,5,opt,name=message,proto3" json:"message,omitempty"`
 	StartBranchName      []byte      `protobuf:"bytes,6,opt,name=start_branch_name,json=startBranchName,proto3" json:"start_branch_name,omitempty"`
 	StartRepository      *Repository `protobuf:"bytes,7,opt,name=start_repository,json=startRepository,proto3" json:"start_repository,omitempty"`
+	DryRun               bool        `protobuf:"varint,8,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -1188,6 +1189,13 @@ func (m *UserCherryPickRequest) GetStartRepository() *Repository {
 	return nil
 }
 
+func (m *UserCherryPickRequest) GetDryRun() bool {
+	if m != nil {
+		return m.DryRun
+	}
+	return false
+}
+
 type UserCherryPickResponse struct {
 	BranchUpdate         *OperationBranchUpdate                 `protobuf:"bytes,1,opt,name=branch_update,json=branchUpdate,proto3" json:"branch_update,omitempty"`
 	CreateTreeError      string                                 `protobuf:"bytes,2,opt,name=create_tree_error,json=createTreeError,proto3" json:"create_tree_error,omitempty"`
@@ -1267,6 +1275,7 @@ type UserRevertRequest struct {
 	Message              []byte      `protobuf:"bytes,5,opt,name=message,proto3" json:"message,omitempty"`
 	StartBranchName      []byte      `protobuf:"bytes,6,opt,name=start_branch_name,json=startBranchName,proto3" json:"start_branch_name,omitempty"`
 	StartRepository      *Repository `protobuf:"bytes,7,opt,name=start_repository,json=startRepository,proto3" json:"start_repository,omitempty"`
+	DryRun               bool        `protobuf:"varint,8,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -1346,6 +1355,13 @@ func (m *UserRevertRequest) GetStartRepository() *Repository {
 	return nil
 }
 
+func (m *UserRevertRequest) GetDryRun() bool {
+	if m != nil {
+		return m.DryRun
+	}
+	return false
+}
+
 type UserRevertResponse struct {
 	BranchUpdate         *OperationBranchUpdate             `protobuf:"bytes,1,opt,name=branch_update,json=branchUpdate,proto3" json:"branch_update,omitempty"`
 	CreateTreeError      string                             `protobuf:"bytes,2,opt,name=create_tree_error,json=createTreeError,proto3" json:"create_tree_error,omitempty"`
@@ -2587,140 +2603,141 @@ func init() {
 func init() { proto.RegisterFile("operations.proto", fileDescriptor_1b4a5877375e491e) }
 
 var fileDescriptor_1b4a5877375e491e = []byte{
-	// 2116 bytes of a gzipped FileDescriptorProto
+	// 2132 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x73, 0x1b, 0x49,
-	0x15, 0xf7, 0x48, 0xb2, 0x2c, 0x3f, 0xcb, 0xb6, 0xdc, 0xd9, 0x64, 0xbd, 0x4a, 0x4c, 0xbc, 0xe3,
-	0x84, 0x38, 0x61, 0x51, 0xb6, 0xc2, 0x16, 0x70, 0x59, 0xa8, 0x58, 0x96, 0x71, 0xc2, 0x3a, 0x36,
-	0x63, 0x07, 0x6a, 0xa9, 0x85, 0xa9, 0xb1, 0xd4, 0x92, 0xa6, 0x90, 0x34, 0xb3, 0x3d, 0x23, 0x13,
-	0x73, 0xe0, 0x48, 0x15, 0x87, 0x3d, 0xf2, 0x71, 0xa7, 0x8a, 0x03, 0xc5, 0x19, 0x6e, 0x14, 0x07,
-	0x6a, 0x0b, 0x6e, 0x5c, 0xb9, 0xf0, 0x07, 0x50, 0xc5, 0x85, 0x8f, 0x0b, 0x27, 0xaa, 0xfb, 0xbd,
-	0x19, 0x4d, 0xcf, 0x8c, 0xbc, 0xce, 0xe2, 0x78, 0x53, 0xd4, 0xde, 0x3c, 0xaf, 0x9f, 0x5e, 0xbf,
-	0xf7, 0x7b, 0x1f, 0xfd, 0x5e, 0xb7, 0xa1, 0xe6, 0xf9, 0x5c, 0x38, 0xa1, 0xeb, 0x8d, 0x82, 0x86,
-	0x2f, 0xbc, 0xd0, 0x63, 0xe5, 0x9e, 0x1b, 0x3a, 0x83, 0xd3, 0x3a, 0x0c, 0xdc, 0x51, 0x88, 0xb4,
-	0x7a, 0x35, 0xe8, 0x3b, 0x82, 0x77, 0xf0, 0xcb, 0xfc, 0xad, 0x01, 0xaf, 0x3e, 0x0d, 0xb8, 0x68,
-	0x0a, 0xee, 0x84, 0x7c, 0x4b, 0x38, 0xa3, 0x76, 0xdf, 0xe2, 0xef, 0x8f, 0x79, 0x10, 0xb2, 0x2f,
-	0x03, 0x08, 0xee, 0x7b, 0x81, 0x1b, 0x7a, 0xe2, 0x74, 0xd5, 0x58, 0x37, 0x36, 0x17, 0x1e, 0xb0,
-	0x06, 0x8a, 0x6c, 0x58, 0xf1, 0xca, 0x56, 0xe9, 0xe7, 0x1f, 0xbe, 0x61, 0x58, 0x09, 0x5e, 0x76,
-	0x13, 0x16, 0x8e, 0x95, 0x28, 0x7b, 0xe4, 0x0c, 0xf9, 0x6a, 0x61, 0xdd, 0xd8, 0xac, 0x5a, 0x80,
-	0xa4, 0x27, 0xce, 0x90, 0xb3, 0x75, 0x28, 0x8d, 0x03, 0x2e, 0x56, 0x8b, 0x4a, 0x68, 0x35, 0x12,
-	0x2a, 0x35, 0xb1, 0xd4, 0x8a, 0x14, 0x11, 0x84, 0x8e, 0x08, 0x6d, 0xdf, 0x73, 0x47, 0xe1, 0x6a,
-	0x09, 0x45, 0x28, 0xd2, 0x81, 0xa4, 0x98, 0x23, 0x58, 0xcd, 0x2a, 0x1e, 0xf8, 0xde, 0x28, 0xe0,
-	0xec, 0xb3, 0x50, 0xc6, 0xcd, 0x48, 0xeb, 0xa5, 0x68, 0x03, 0xe2, 0xa3, 0x55, 0x76, 0x0f, 0x56,
-	0x7c, 0xc1, 0x6d, 0xc1, 0xdb, 0xdc, 0x3d, 0xe1, 0x36, 0x17, 0xc2, 0x13, 0x4a, 0xdb, 0x79, 0x6b,
-	0xd9, 0x17, 0xdc, 0x42, 0x7a, 0x4b, 0x92, 0xcd, 0x0f, 0x09, 0xa9, 0xa7, 0x7e, 0xe7, 0xe5, 0x42,
-	0xea, 0x1a, 0x94, 0x47, 0xfc, 0xfb, 0x82, 0x9f, 0x10, 0x48, 0xf4, 0x25, 0xe9, 0xde, 0xa0, 0x23,
-	0xe9, 0xb3, 0x48, 0xc7, 0x2f, 0x73, 0x07, 0x81, 0xd3, 0xed, 0x20, 0xe0, 0x72, 0x01, 0x31, 0xf2,
-	0x01, 0xf9, 0x29, 0x01, 0xb2, 0xcd, 0x07, 0xfc, 0x65, 0x02, 0x24, 0x32, 0x50, 0xd7, 0xeb, 0x63,
-	0x18, 0xf8, 0x81, 0x01, 0xaf, 0x4c, 0x04, 0x1d, 0x39, 0xbd, 0xff, 0xdd, 0xba, 0xd7, 0xa0, 0x12,
-	0x3a, 0xbd, 0xa4, 0x69, 0x73, 0xa1, 0xd3, 0x3b, 0xa7, 0x5d, 0x4d, 0xb8, 0x9a, 0x52, 0xe7, 0x63,
-	0x18, 0xf5, 0x67, 0x32, 0x0a, 0xf3, 0xe6, 0x13, 0x37, 0x8a, 0xdd, 0x81, 0xe5, 0xd0, 0x11, 0x3d,
-	0x1e, 0xda, 0x82, 0x9f, 0xb8, 0x81, 0xeb, 0x8d, 0x28, 0x8c, 0x97, 0x90, 0x6c, 0x11, 0x95, 0xad,
-	0xc2, 0xdc, 0x90, 0x07, 0x81, 0xd3, 0xe3, 0x14, 0xcf, 0xd1, 0xa7, 0xf9, 0x03, 0xc4, 0x25, 0x61,
-	0x11, 0xe1, 0xb2, 0x06, 0xc5, 0xd0, 0xe9, 0x91, 0x2d, 0x0b, 0xd1, 0xe6, 0x92, 0x43, 0xd2, 0x65,
-	0x82, 0xf0, 0x67, 0x6e, 0x10, 0x06, 0x4a, 0xeb, 0x8a, 0x45, 0x5f, 0xf9, 0x70, 0x16, 0xf3, 0xe1,
-	0xfc, 0x8b, 0x01, 0xd7, 0xe4, 0xe6, 0x7b, 0x5c, 0xf4, 0x2e, 0x2c, 0x07, 0x22, 0xd4, 0x0a, 0x53,
-	0x51, 0xbb, 0x0e, 0xf3, 0x6d, 0x6f, 0x38, 0x74, 0x43, 0xdb, 0xed, 0x90, 0x6a, 0x15, 0x24, 0x3c,
-	0xea, 0x48, 0xbb, 0xa8, 0xfa, 0x51, 0x41, 0xa0, 0x6a, 0x37, 0x15, 0x41, 0xf6, 0x0a, 0xcc, 0x3a,
-	0xbe, 0x3f, 0x38, 0x5d, 0x2d, 0x2b, 0x20, 0xf0, 0xc3, 0xfc, 0x35, 0x25, 0xb8, 0x66, 0x1b, 0x41,
-	0xab, 0x29, 0x60, 0xa4, 0x14, 0xd8, 0x82, 0x45, 0xca, 0xe1, 0xb1, 0x2a, 0x32, 0xe4, 0xfe, 0xb5,
-	0xc8, 0x90, 0xfd, 0xe8, 0x9c, 0x42, 0xa1, 0x58, 0x89, 0xac, 0xea, 0x71, 0xe2, 0x2b, 0xdf, 0x09,
-	0xa5, 0x5c, 0x27, 0x3c, 0x2e, 0x55, 0x0a, 0xb5, 0xa2, 0xf9, 0x41, 0x01, 0xe3, 0x40, 0xa9, 0x7b,
-	0xe4, 0x59, 0xbc, 0x7b, 0x19, 0x9e, 0x58, 0x03, 0x08, 0xbc, 0xb1, 0x68, 0x73, 0x3b, 0xe8, 0x3b,
-	0xe4, 0x8a, 0x79, 0xa4, 0x1c, 0xf6, 0x9d, 0xa9, 0xbe, 0x58, 0x03, 0x88, 0xc3, 0xbe, 0x4b, 0xee,
-	0x98, 0x8f, 0x22, 0xbe, 0x9b, 0x74, 0x55, 0x59, 0x77, 0xd5, 0x26, 0xd4, 0xba, 0xae, 0x08, 0x42,
-	0xdb, 0x77, 0x04, 0x1f, 0xe1, 0xcf, 0xe7, 0x30, 0x61, 0x14, 0xfd, 0x40, 0x91, 0x2d, 0xde, 0x35,
-	0x9d, 0x44, 0x64, 0x12, 0x1c, 0xe7, 0x71, 0xde, 0xf3, 0x9c, 0x89, 0x3f, 0x84, 0xab, 0xb9, 0xbe,
-	0x3c, 0x7b, 0x87, 0xd7, 0xa1, 0x2a, 0x21, 0xb6, 0xdb, 0x2a, 0x61, 0x3b, 0x94, 0x7d, 0x0b, 0x92,
-	0x86, 0x39, 0xdc, 0x61, 0xb7, 0x61, 0x89, 0x22, 0x28, 0x62, 0x2a, 0x2a, 0x26, 0x8a, 0x2b, 0x62,
-	0x33, 0x7f, 0x69, 0xc0, 0x15, 0x69, 0xe3, 0xce, 0xce, 0xcb, 0x9d, 0x7a, 0xe6, 0x8f, 0xa8, 0xea,
-	0x4e, 0x14, 0x25, 0x57, 0x64, 0x52, 0xc5, 0xb8, 0xa0, 0x54, 0x99, 0xe2, 0xb1, 0x3f, 0x50, 0x92,
-	0x34, 0xfb, 0x5c, 0x88, 0xd3, 0x03, 0xb7, 0xfd, 0xbd, 0xcb, 0xc0, 0xec, 0x2e, 0x94, 0x11, 0x22,
-	0xaa, 0x04, 0x2b, 0x11, 0xcf, 0xd7, 0xdc, 0xb0, 0xa9, 0x16, 0x2c, 0x62, 0x48, 0x9f, 0xff, 0xa5,
-	0xcc, 0xf9, 0x3f, 0xbd, 0x8a, 0xdd, 0x83, 0x15, 0x6c, 0x19, 0x93, 0x02, 0x30, 0x7d, 0x96, 0xd5,
-	0xc2, 0xd6, 0x44, 0xca, 0xdb, 0x50, 0x43, 0xde, 0x84, 0xcd, 0x73, 0xd3, 0x6c, 0xa6, 0x9f, 0x4f,
-	0x08, 0xe6, 0x3f, 0x0a, 0x98, 0x5c, 0x49, 0x18, 0x2f, 0xd6, 0xa3, 0x18, 0xf7, 0x76, 0x28, 0x78,
-	0xca, 0xa3, 0xb8, 0x70, 0x24, 0x38, 0x7a, 0x54, 0x66, 0x13, 0xc5, 0x63, 0xf2, 0xa0, 0x5a, 0x40,
-	0x1a, 0xb2, 0x3c, 0x47, 0x2d, 0x65, 0x6d, 0xb8, 0x96, 0xd9, 0xda, 0x6e, 0x7b, 0x1d, 0x44, 0x7b,
-	0xe9, 0x41, 0x23, 0xe9, 0xde, 0xac, 0xf9, 0x8d, 0xa6, 0xae, 0x9e, 0x75, 0x25, 0xa5, 0x6f, 0xd3,
-	0xeb, 0x70, 0xf3, 0x2d, 0x58, 0x4e, 0xf1, 0xb1, 0x0a, 0x94, 0x9e, 0xec, 0x3f, 0x69, 0xd5, 0x66,
-	0xd8, 0x3c, 0xcc, 0xb6, 0xf6, 0x0e, 0x8e, 0xde, 0xad, 0x19, 0xac, 0x0a, 0x95, 0xe6, 0xfe, 0x93,
-	0x9d, 0x77, 0x1e, 0x35, 0x8f, 0x6a, 0x05, 0xf3, 0xf7, 0x05, 0x58, 0x51, 0x41, 0xc5, 0x4f, 0xb8,
-	0xf4, 0xc6, 0xa7, 0x71, 0xfb, 0xdc, 0x71, 0xfb, 0xb7, 0x02, 0xb0, 0x24, 0x84, 0xff, 0x1f, 0x31,
-	0x6b, 0x7f, 0x44, 0xcc, 0xde, 0xd3, 0x5c, 0xab, 0x99, 0xfe, 0x22, 0xe3, 0xf5, 0xdf, 0x05, 0xb8,
-	0xae, 0xb2, 0x44, 0x99, 0xb5, 0xe3, 0x0e, 0x78, 0xf0, 0xb0, 0x2d, 0x51, 0xdc, 0xe5, 0x4e, 0x87,
-	0x0b, 0xb6, 0x03, 0x65, 0x47, 0x7d, 0x2b, 0xb8, 0xd3, 0xa9, 0x95, 0xff, 0xa3, 0x06, 0x7e, 0x1c,
-	0x9d, 0xfa, 0xdc, 0xa2, 0x5f, 0xcb, 0x13, 0xa9, 0xeb, 0x0e, 0xb8, 0xed, 0x3b, 0x61, 0x9f, 0x1a,
-	0xf0, 0x8a, 0x24, 0x1c, 0x38, 0x61, 0x9f, 0x6d, 0xc0, 0xa2, 0x2f, 0x3b, 0x6b, 0x6f, 0x1c, 0x20,
-	0x43, 0x51, 0x31, 0x54, 0x23, 0xa2, 0x62, 0x92, 0xc7, 0xad, 0x13, 0xf0, 0x2f, 0xbe, 0x65, 0xb7,
-	0xbd, 0x51, 0xc8, 0x69, 0xde, 0x96, 0xc7, 0xad, 0xa2, 0x36, 0x91, 0xc8, 0xee, 0x42, 0x8d, 0x3f,
-	0xe3, 0xed, 0x71, 0xc8, 0x6d, 0x29, 0x7f, 0x18, 0x21, 0x5c, 0xb1, 0x96, 0x89, 0xbe, 0x43, 0x64,
-	0xb9, 0xad, 0x3b, 0xea, 0x72, 0x11, 0x0b, 0xc4, 0xce, 0xb2, 0xaa, 0x88, 0x24, 0xcf, 0x7c, 0x0a,
-	0x30, 0x31, 0x87, 0x01, 0x94, 0x9b, 0x56, 0xeb, 0xe1, 0x91, 0xc4, 0x74, 0x09, 0x00, 0xff, 0xb6,
-	0xb7, 0x1f, 0x59, 0x35, 0x43, 0xae, 0x3d, 0x3d, 0xd8, 0x96, 0x6b, 0x05, 0x89, 0xfc, 0xde, 0xfe,
-	0x37, 0x5b, 0xb5, 0xa2, 0xa4, 0x6e, 0xb7, 0xde, 0x69, 0x1d, 0xb5, 0x6a, 0x25, 0xe9, 0x85, 0xe6,
-	0xee, 0xde, 0xfe, 0x76, 0x6d, 0x56, 0x0e, 0xa6, 0x57, 0x73, 0x21, 0x64, 0x6f, 0x43, 0xb9, 0xaf,
-	0x60, 0xa4, 0x00, 0xdf, 0x38, 0x07, 0xe2, 0xbb, 0x33, 0x16, 0xfd, 0x88, 0xd5, 0x61, 0x2e, 0x32,
-	0x47, 0xc1, 0xbc, 0x3b, 0x63, 0x45, 0x84, 0x2d, 0x13, 0xd6, 0x65, 0xc9, 0xb0, 0x29, 0xae, 0x25,
-	0x3e, 0x81, 0x8d, 0x0e, 0xb2, 0x7d, 0xe7, 0x74, 0xe0, 0x39, 0x1d, 0xf3, 0x77, 0x45, 0xb8, 0x91,
-	0xda, 0x89, 0xaa, 0x18, 0x45, 0xc4, 0x8b, 0xac, 0x65, 0xa9, 0x02, 0x55, 0xcc, 0x14, 0xa8, 0xdb,
-	0xb0, 0x44, 0xca, 0x47, 0x75, 0x0a, 0x8b, 0xd8, 0x22, 0x52, 0xf7, 0xa8, 0x5a, 0xbd, 0x01, 0x8c,
-	0xd8, 0x9c, 0x71, 0xd8, 0xf7, 0x04, 0x8a, 0xc3, 0x92, 0x56, 0xc3, 0x95, 0x87, 0x6a, 0x41, 0x09,
-	0x6d, 0xc0, 0x15, 0x9d, 0x9b, 0x0f, 0x1d, 0x77, 0x40, 0xd5, 0x6d, 0x25, 0xc9, 0xde, 0x92, 0x0b,
-	0xf9, 0xb5, 0x70, 0xee, 0xfc, 0xb5, 0xb0, 0x72, 0xee, 0x5a, 0x28, 0x87, 0x9e, 0xae, 0x27, 0xda,
-	0x7c, 0x75, 0x1e, 0x87, 0x1e, 0xf5, 0x21, 0x93, 0x09, 0x85, 0xca, 0x76, 0x1e, 0xb0, 0xbd, 0x53,
-	0x84, 0xc3, 0xbe, 0x63, 0xfe, 0x86, 0xa6, 0xbd, 0xac, 0x03, 0xd9, 0x57, 0x52, 0xa1, 0x75, 0x6b,
-	0x4a, 0x68, 0x69, 0x0e, 0x4f, 0xc4, 0xd6, 0x97, 0xe2, 0x62, 0x50, 0xd0, 0x6b, 0x6f, 0x7e, 0x68,
-	0xce, 0x44, 0xd9, 0xbf, 0xb5, 0x01, 0xaf, 0x67, 0x03, 0x4f, 0xe0, 0x2e, 0x71, 0xe4, 0xfd, 0x2a,
-	0xba, 0xe6, 0x4b, 0x2a, 0x72, 0x81, 0xc5, 0xff, 0x26, 0x2c, 0xb8, 0xa3, 0x0e, 0x7f, 0xa6, 0x95,
-	0x7d, 0x50, 0xa4, 0x33, 0xca, 0xf9, 0x94, 0x99, 0xfa, 0x9f, 0x94, 0x26, 0x16, 0x97, 0xe5, 0xa7,
-	0xe9, 0x8d, 0xba, 0xae, 0x18, 0x3a, 0xc7, 0x03, 0x1e, 0x61, 0xdd, 0x4a, 0x61, 0xfd, 0x39, 0xbd,
-	0xbe, 0xe7, 0xff, 0xaa, 0x91, 0x81, 0xfc, 0x5a, 0x34, 0xf5, 0xaa, 0x01, 0x64, 0x77, 0x86, 0xe6,
-	0xde, 0xfa, 0x1f, 0x0b, 0x50, 0xbe, 0x84, 0x84, 0xbc, 0x0e, 0xf3, 0x42, 0xe9, 0x9a, 0x18, 0x24,
-	0x90, 0x70, 0xc6, 0x0c, 0xbf, 0x06, 0x94, 0xb2, 0x2a, 0x3e, 0x67, 0x71, 0xdc, 0x44, 0x8a, 0x1c,
-	0x37, 0xbf, 0x0a, 0x2b, 0x82, 0x0f, 0xbd, 0x90, 0x27, 0x73, 0xa2, 0x3c, 0x35, 0x27, 0x6a, 0xc8,
-	0x9c, 0x48, 0x8a, 0x0d, 0x58, 0x24, 0x01, 0xb4, 0x3d, 0xe6, 0x5e, 0x15, 0x89, 0x18, 0x01, 0x72,
-	0x06, 0xed, 0xb9, 0xa1, 0xed, 0x8f, 0x83, 0xbe, 0xed, 0xf9, 0xea, 0xc2, 0x79, 0xb5, 0xb2, 0x5e,
-	0xdc, 0x9c, 0xb7, 0x96, 0x7a, 0x6e, 0x78, 0x30, 0x0e, 0xfa, 0xfb, 0x48, 0xdd, 0xba, 0x0b, 0x77,
-	0x54, 0x70, 0x92, 0xa1, 0xed, 0x89, 0x57, 0x32, 0x21, 0xfa, 0x57, 0x03, 0xd6, 0xa6, 0xf8, 0x8f,
-	0x02, 0xf5, 0xa6, 0x74, 0x86, 0x92, 0x23, 0x6d, 0x57, 0x53, 0xe5, 0xee, 0x8c, 0x45, 0x20, 0x4a,
-	0xeb, 0xef, 0xc0, 0x12, 0x31, 0x48, 0x47, 0xba, 0xd1, 0x68, 0xb9, 0x3b, 0x63, 0x2d, 0x22, 0xfd,
-	0x21, 0x92, 0x9f, 0x27, 0x1a, 0xa5, 0x9b, 0x7a, 0x71, 0xa3, 0x82, 0x0d, 0x48, 0xa5, 0x47, 0x5d,
-	0xca, 0xd6, 0x3d, 0xd8, 0x9c, 0x6e, 0x1f, 0xaa, 0x1d, 0x1b, 0xf8, 0x13, 0x6a, 0x5f, 0x0f, 0xdf,
-	0x1f, 0x3b, 0xc1, 0x65, 0x8d, 0xaa, 0x81, 0xda, 0x2c, 0x11, 0x61, 0x48, 0x78, 0xd4, 0xd1, 0x0b,
-	0xdd, 0xac, 0x5e, 0xe8, 0xd8, 0xab, 0x30, 0xc7, 0x47, 0x1d, 0xb5, 0x54, 0x56, 0x4b, 0x65, 0x3e,
-	0xea, 0xc8, 0x85, 0x5b, 0x50, 0xc6, 0x42, 0x4e, 0x5d, 0xa7, 0xbe, 0x2d, 0xad, 0xe5, 0x1c, 0x25,
-	0x95, 0x9c, 0xa3, 0xe4, 0x71, 0xa9, 0x52, 0xaa, 0xcd, 0x9a, 0x2e, 0xb6, 0xa4, 0x11, 0x2c, 0xf1,
-	0xdd, 0x1d, 0x90, 0xee, 0xb1, 0xb3, 0x2d, 0xb2, 0x46, 0xea, 0xa1, 0x79, 0xa5, 0xa8, 0x7b, 0x05,
-	0xef, 0x83, 0xac, 0xac, 0x8b, 0xcd, 0x5f, 0xd0, 0xf4, 0x2b, 0xe3, 0xe0, 0xf4, 0xc0, 0x09, 0x27,
-	0x37, 0x06, 0x67, 0x96, 0xef, 0x0c, 0x7b, 0x23, 0xaf, 0x35, 0xf0, 0x25, 0x03, 0x0f, 0x26, 0xad,
-	0x01, 0x11, 0xea, 0x3f, 0x36, 0x2e, 0xa5, 0x9e, 0x6c, 0xc0, 0x22, 0x5d, 0x29, 0x51, 0xea, 0x52,
-	0xa7, 0x87, 0x44, 0x4c, 0xdd, 0xb8, 0x4d, 0x51, 0x95, 0xce, 0x56, 0x1a, 0x66, 0x32, 0xf1, 0x3d,
-	0x3c, 0xe4, 0x92, 0x56, 0x5f, 0xdc, 0x51, 0x61, 0xfe, 0xcb, 0x80, 0xfa, 0xe4, 0xfd, 0xe1, 0x70,
-	0x7c, 0x3c, 0xf4, 0x3a, 0xe3, 0x49, 0x6d, 0x7f, 0xc1, 0x77, 0x75, 0x14, 0x96, 0x89, 0xbb, 0x3a,
-	0xa4, 0x9c, 0x75, 0x57, 0x77, 0x03, 0xe6, 0x83, 0x48, 0xcd, 0xe8, 0xaa, 0x2e, 0x26, 0xe4, 0xc4,
-	0x7a, 0x39, 0x27, 0xd6, 0xcd, 0x3f, 0x19, 0x38, 0x0c, 0x64, 0xcc, 0xfe, 0x64, 0x2e, 0x82, 0x32,
-	0x23, 0x58, 0x29, 0x33, 0x82, 0x3d, 0x2e, 0x55, 0x8a, 0xb5, 0x92, 0x95, 0x9d, 0xea, 0x1e, 0xfc,
-	0x1d, 0xa0, 0x16, 0xeb, 0x73, 0xc8, 0xc5, 0x89, 0xdb, 0xe6, 0xec, 0x3b, 0x50, 0x4b, 0xbf, 0xc7,
-	0xb1, 0x9b, 0x5a, 0x13, 0x93, 0x7d, 0x62, 0xac, 0xaf, 0x4f, 0x67, 0x40, 0x5c, 0xcc, 0xf2, 0x7f,
-	0x7e, 0xb6, 0x59, 0xa8, 0x18, 0x91, 0xf8, 0xe4, 0xab, 0x95, 0x2e, 0x3e, 0xe7, 0x5d, 0x4e, 0x17,
-	0x9f, 0xf7, 0xe0, 0x95, 0x16, 0x9f, 0x7c, 0x33, 0xd2, 0xc5, 0xe7, 0xbc, 0x72, 0xe9, 0xe2, 0xf3,
-	0x9e, 0x9b, 0x62, 0xf1, 0x47, 0xb0, 0xa8, 0x3d, 0x51, 0xb0, 0x1b, 0x59, 0xc3, 0x27, 0x6f, 0x31,
-	0xf5, 0xb5, 0x29, 0xab, 0xf9, 0x52, 0xe3, 0x07, 0x21, 0x5d, 0x6a, 0xfa, 0xd9, 0x4a, 0x97, 0x9a,
-	0x79, 0x45, 0x8a, 0xa5, 0x7e, 0x0b, 0x96, 0xf4, 0x7b, 0x63, 0xa6, 0xfd, 0x30, 0x73, 0xbd, 0x5e,
-	0xff, 0xcc, 0xb4, 0xe5, 0x94, 0xe0, 0xef, 0xc2, 0x72, 0xea, 0x39, 0x81, 0x65, 0x7f, 0xaa, 0x23,
-	0x7c, 0x73, 0xea, 0xba, 0x2e, 0x7b, 0xd3, 0x78, 0xd3, 0x60, 0xdf, 0x80, 0x6a, 0xf2, 0x8e, 0x95,
-	0x5d, 0x4f, 0xfe, 0x38, 0x75, 0x45, 0x5c, 0xbf, 0x91, 0xbf, 0x98, 0x8f, 0xc5, 0xe4, 0x9e, 0x4b,
-	0xc7, 0x22, 0x73, 0x8b, 0xaa, 0x63, 0x91, 0xbd, 0x1e, 0x8b, 0x05, 0xbf, 0x87, 0x58, 0x24, 0xfa,
-	0x71, 0x1d, 0x8b, 0xec, 0xc4, 0xa0, 0x63, 0x91, 0xd3, 0xc8, 0x4f, 0xb0, 0x60, 0x3e, 0x1e, 0x73,
-	0x99, 0x56, 0x8a, 0xdd, 0x3a, 0x4f, 0xa7, 0x5c, 0xbf, 0xfd, 0x11, 0x5c, 0x39, 0xd8, 0x7f, 0x1d,
-	0x60, 0x72, 0xb9, 0xc2, 0x5e, 0xcb, 0xbb, 0x70, 0x41, 0xd9, 0xf5, 0xe9, 0x77, 0x31, 0x31, 0x38,
-	0x24, 0x0c, 0x3b, 0x02, 0x5d, 0x98, 0xd6, 0x3c, 0xe9, 0xc2, 0xf4, 0x06, 0x22, 0x16, 0xf6, 0x2e,
-	0xba, 0x70, 0x72, 0x9a, 0xe9, 0x2e, 0xcc, 0x9c, 0xed, 0xba, 0x0b, 0xb3, 0x87, 0x60, 0x02, 0xe6,
-	0x2e, 0xbe, 0x3e, 0xa4, 0x4a, 0x3a, 0x33, 0xb3, 0x55, 0x27, 0x7d, 0xcc, 0xd5, 0x37, 0xce, 0xe4,
-	0xd1, 0x77, 0xda, 0x7a, 0xf3, 0xdb, 0x92, 0x7b, 0xe0, 0x1c, 0x37, 0xda, 0xde, 0xf0, 0x3e, 0xfe,
-	0xf9, 0x79, 0x4f, 0xf4, 0xee, 0xa3, 0x8c, 0xfb, 0xea, 0x5f, 0x39, 0xee, 0xf7, 0x3c, 0xfa, 0xf6,
-	0x8f, 0x8f, 0xcb, 0x8a, 0xf4, 0x85, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xaa, 0x5b, 0x1a,
-	0x13, 0x22, 0x00, 0x00,
+	0x15, 0xf7, 0x48, 0xb2, 0x2c, 0x3f, 0xcb, 0xb6, 0xdc, 0xf9, 0x58, 0xad, 0x12, 0x63, 0xef, 0x38,
+	0x21, 0x4e, 0x58, 0x94, 0xad, 0xb0, 0x05, 0x5c, 0x16, 0x2a, 0x96, 0x65, 0x9c, 0xb0, 0x8e, 0xcd,
+	0xd8, 0x81, 0x5a, 0x6a, 0x61, 0x6a, 0x2c, 0xb5, 0xa4, 0x29, 0x24, 0xcd, 0x6c, 0xcf, 0xc8, 0xc4,
+	0x1c, 0x38, 0x52, 0xc5, 0x61, 0x8f, 0x7c, 0xdc, 0xa9, 0xe2, 0x40, 0x71, 0x86, 0x1b, 0xc7, 0x2d,
+	0xb8, 0x71, 0xdd, 0x03, 0xfc, 0x01, 0x54, 0x71, 0xe1, 0xe3, 0xc2, 0x89, 0xea, 0x7e, 0x6f, 0xa4,
+	0xe9, 0x99, 0x91, 0xd7, 0x59, 0x1c, 0x27, 0x45, 0xed, 0xcd, 0xf3, 0xfa, 0xe9, 0xf5, 0x7b, 0xbf,
+	0xf7, 0xd1, 0xef, 0x75, 0x1b, 0x2a, 0x9e, 0xcf, 0x85, 0x13, 0xba, 0xde, 0x30, 0xa8, 0xfb, 0xc2,
+	0x0b, 0x3d, 0x56, 0xec, 0xba, 0xa1, 0xd3, 0x3f, 0xad, 0x41, 0xdf, 0x1d, 0x86, 0x48, 0xab, 0x95,
+	0x83, 0x9e, 0x23, 0x78, 0x1b, 0xbf, 0xcc, 0xdf, 0x1b, 0xf0, 0xda, 0xd3, 0x80, 0x8b, 0x86, 0xe0,
+	0x4e, 0xc8, 0xb7, 0x84, 0x33, 0x6c, 0xf5, 0x2c, 0xfe, 0xc1, 0x88, 0x07, 0x21, 0xfb, 0x2a, 0x80,
+	0xe0, 0xbe, 0x17, 0xb8, 0xa1, 0x27, 0x4e, 0xab, 0xc6, 0xba, 0xb1, 0xb9, 0xf0, 0x80, 0xd5, 0x51,
+	0x64, 0xdd, 0x1a, 0xaf, 0x6c, 0x15, 0x7e, 0xf9, 0xd1, 0x9b, 0x86, 0x15, 0xe3, 0x65, 0x6b, 0xb0,
+	0x70, 0xac, 0x44, 0xd9, 0x43, 0x67, 0xc0, 0xab, 0xb9, 0x75, 0x63, 0xb3, 0x6c, 0x01, 0x92, 0x9e,
+	0x38, 0x03, 0xce, 0xd6, 0xa1, 0x30, 0x0a, 0xb8, 0xa8, 0xe6, 0x95, 0xd0, 0x72, 0x24, 0x54, 0x6a,
+	0x62, 0xa9, 0x15, 0x29, 0x22, 0x08, 0x1d, 0x11, 0xda, 0xbe, 0xe7, 0x0e, 0xc3, 0x6a, 0x01, 0x45,
+	0x28, 0xd2, 0x81, 0xa4, 0x98, 0x43, 0xa8, 0xa6, 0x15, 0x0f, 0x7c, 0x6f, 0x18, 0x70, 0xf6, 0x79,
+	0x28, 0xe2, 0x66, 0xa4, 0xf5, 0x52, 0xb4, 0x01, 0xf1, 0xd1, 0x2a, 0xbb, 0x07, 0x2b, 0xbe, 0xe0,
+	0xb6, 0xe0, 0x2d, 0xee, 0x9e, 0x70, 0x9b, 0x0b, 0xe1, 0x09, 0xa5, 0xed, 0xbc, 0xb5, 0xec, 0x0b,
+	0x6e, 0x21, 0xbd, 0x29, 0xc9, 0xe6, 0x47, 0x84, 0xd4, 0x53, 0xbf, 0xfd, 0x6a, 0x21, 0x75, 0x1d,
+	0x8a, 0x43, 0xfe, 0x43, 0xc1, 0x4f, 0x08, 0x24, 0xfa, 0x92, 0x74, 0xaf, 0xdf, 0x96, 0xf4, 0x59,
+	0xa4, 0xe3, 0x97, 0xb9, 0x83, 0xc0, 0xe9, 0x76, 0x10, 0x70, 0x99, 0x80, 0x18, 0xd9, 0x80, 0xfc,
+	0x9c, 0x00, 0xd9, 0xe6, 0x7d, 0xfe, 0x2a, 0x01, 0x12, 0x19, 0xa8, 0xeb, 0xf5, 0x29, 0x0c, 0xfc,
+	0xd0, 0x80, 0xab, 0x13, 0x41, 0x47, 0x4e, 0xf7, 0x7f, 0xb7, 0xee, 0x75, 0x28, 0x85, 0x4e, 0x37,
+	0x6e, 0xda, 0x5c, 0xe8, 0x74, 0xcf, 0x69, 0x57, 0x03, 0xae, 0x25, 0xd4, 0xf9, 0x14, 0x46, 0xfd,
+	0x99, 0x8c, 0xc2, 0xbc, 0x79, 0xe9, 0x46, 0xb1, 0x3b, 0xb0, 0x1c, 0x3a, 0xa2, 0xcb, 0x43, 0x5b,
+	0xf0, 0x13, 0x37, 0x70, 0xbd, 0x21, 0x85, 0xf1, 0x12, 0x92, 0x2d, 0xa2, 0xb2, 0x2a, 0xcc, 0x0d,
+	0x78, 0x10, 0x38, 0x5d, 0x4e, 0xf1, 0x1c, 0x7d, 0x9a, 0x3f, 0x42, 0x5c, 0x62, 0x16, 0x11, 0x2e,
+	0xab, 0x90, 0x0f, 0x9d, 0x2e, 0xd9, 0xb2, 0x10, 0x6d, 0x2e, 0x39, 0x24, 0x5d, 0x26, 0x08, 0x7f,
+	0xe6, 0x06, 0x61, 0xa0, 0xb4, 0x2e, 0x59, 0xf4, 0x95, 0x0d, 0x67, 0x3e, 0x1b, 0xce, 0x8f, 0x0d,
+	0xb8, 0x2e, 0x37, 0xdf, 0xe3, 0xa2, 0x7b, 0x61, 0x39, 0x10, 0xa1, 0x96, 0x9b, 0x8a, 0xda, 0x0d,
+	0x98, 0x6f, 0x79, 0x83, 0x81, 0x1b, 0xda, 0x6e, 0x9b, 0x54, 0x2b, 0x21, 0xe1, 0x51, 0x5b, 0xda,
+	0x45, 0xd5, 0x8f, 0x0a, 0x02, 0x55, 0xbb, 0xa9, 0x08, 0xb2, 0xab, 0x30, 0xeb, 0xf8, 0x7e, 0xff,
+	0xb4, 0x5a, 0x54, 0x40, 0xe0, 0x87, 0xf9, 0x5b, 0x4a, 0x70, 0xcd, 0x36, 0x82, 0x56, 0x53, 0xc0,
+	0x48, 0x28, 0xb0, 0x05, 0x8b, 0x94, 0xc3, 0x23, 0x55, 0x64, 0xc8, 0xfd, 0xab, 0x91, 0x21, 0xfb,
+	0xd1, 0x39, 0x85, 0x42, 0xb1, 0x12, 0x59, 0xe5, 0xe3, 0xd8, 0x57, 0xb6, 0x13, 0x0a, 0x99, 0x4e,
+	0x78, 0x5c, 0x28, 0xe5, 0x2a, 0x79, 0xf3, 0xc3, 0x1c, 0xc6, 0x81, 0x52, 0xf7, 0xc8, 0xb3, 0x78,
+	0xe7, 0x32, 0x3c, 0xb1, 0x0a, 0x10, 0x78, 0x23, 0xd1, 0xe2, 0x76, 0xd0, 0x73, 0xc8, 0x15, 0xf3,
+	0x48, 0x39, 0xec, 0x39, 0x53, 0x7d, 0xb1, 0x0a, 0x30, 0x0e, 0xfb, 0x0e, 0xb9, 0x63, 0x3e, 0x8a,
+	0xf8, 0x4e, 0xdc, 0x55, 0x45, 0xdd, 0x55, 0x9b, 0x50, 0xe9, 0xb8, 0x22, 0x08, 0x6d, 0xdf, 0x11,
+	0x7c, 0x88, 0x3f, 0x9f, 0xc3, 0x84, 0x51, 0xf4, 0x03, 0x45, 0xb6, 0x78, 0xc7, 0x74, 0x62, 0x91,
+	0x49, 0x70, 0x9c, 0xc7, 0x79, 0xcf, 0x73, 0x26, 0xfe, 0x18, 0xae, 0x65, 0xfa, 0xf2, 0xec, 0x1d,
+	0xde, 0x80, 0xb2, 0x84, 0xd8, 0x6e, 0xa9, 0x84, 0x6d, 0x53, 0xf6, 0x2d, 0x48, 0x1a, 0xe6, 0x70,
+	0x9b, 0xdd, 0x86, 0x25, 0x8a, 0xa0, 0x88, 0x29, 0xaf, 0x98, 0x28, 0xae, 0x88, 0xcd, 0xfc, 0xb5,
+	0x01, 0x57, 0xa4, 0x8d, 0x3b, 0x3b, 0xaf, 0x76, 0xea, 0x99, 0x3f, 0xa1, 0xaa, 0x3b, 0x51, 0x94,
+	0x5c, 0x91, 0x4a, 0x15, 0xe3, 0x82, 0x52, 0x65, 0x8a, 0xc7, 0xfe, 0x42, 0x49, 0xd2, 0xe8, 0x71,
+	0x21, 0x4e, 0x0f, 0xdc, 0xd6, 0x0f, 0x2e, 0x03, 0xb3, 0xbb, 0x50, 0x44, 0x88, 0xa8, 0x12, 0xac,
+	0x44, 0x3c, 0xdf, 0x70, 0xc3, 0x86, 0x5a, 0xb0, 0x88, 0x21, 0x79, 0xfe, 0x17, 0x52, 0xe7, 0xff,
+	0xf4, 0x2a, 0x76, 0x0f, 0x56, 0xb0, 0x65, 0x8c, 0x0b, 0xc0, 0xf4, 0x59, 0x56, 0x0b, 0x5b, 0x13,
+	0x29, 0xef, 0x40, 0x05, 0x79, 0x63, 0x36, 0xcf, 0x4d, 0xb3, 0x99, 0x7e, 0x3e, 0x21, 0xb0, 0xd7,
+	0x60, 0xae, 0x2d, 0x4e, 0x6d, 0x31, 0x1a, 0x56, 0x4b, 0x78, 0x76, 0xb4, 0xc5, 0xa9, 0x35, 0x1a,
+	0x9a, 0xff, 0xc8, 0x61, 0xd6, 0xc5, 0xf1, 0xbd, 0x58, 0x57, 0x63, 0x42, 0xd8, 0xa1, 0xe0, 0x09,
+	0x57, 0xe3, 0xc2, 0x91, 0xe0, 0xe8, 0x6a, 0x99, 0x66, 0x14, 0xa8, 0xf1, 0x13, 0x6c, 0x01, 0x69,
+	0xc8, 0xf2, 0x1c, 0x45, 0x96, 0xb5, 0xe0, 0x7a, 0x6a, 0x6b, 0xbb, 0xe5, 0xb5, 0xd1, 0x0d, 0x4b,
+	0x0f, 0xea, 0x71, 0xbf, 0xa7, 0xcd, 0xaf, 0x37, 0x74, 0xf5, 0xac, 0x2b, 0x09, 0x7d, 0x1b, 0x5e,
+	0x9b, 0x9b, 0x6f, 0xc3, 0x72, 0x82, 0x8f, 0x95, 0xa0, 0xf0, 0x64, 0xff, 0x49, 0xb3, 0x32, 0xc3,
+	0xe6, 0x61, 0xb6, 0xb9, 0x77, 0x70, 0xf4, 0x5e, 0xc5, 0x60, 0x65, 0x28, 0x35, 0xf6, 0x9f, 0xec,
+	0xbc, 0xfb, 0xa8, 0x71, 0x54, 0xc9, 0x99, 0x1f, 0xe7, 0x60, 0x45, 0x45, 0x1b, 0x3f, 0xe1, 0xd2,
+	0x4d, 0x9f, 0x05, 0xf4, 0xc5, 0x05, 0xf4, 0xdf, 0x72, 0xc0, 0xe2, 0xd8, 0xfe, 0x7f, 0x04, 0xb3,
+	0xfd, 0x09, 0xc1, 0x7c, 0x4f, 0xf3, 0xb9, 0x66, 0xfa, 0x8b, 0x0c, 0xe4, 0x7f, 0xe7, 0xe0, 0x86,
+	0x4a, 0x1f, 0x65, 0xd6, 0x8e, 0xdb, 0xe7, 0xc1, 0xc3, 0x96, 0x44, 0x71, 0x97, 0x3b, 0x6d, 0x2e,
+	0xd8, 0x0e, 0x14, 0x1d, 0xf5, 0xad, 0xe0, 0x4e, 0xe6, 0x5c, 0xf6, 0x8f, 0xea, 0xf8, 0x71, 0x74,
+	0xea, 0x73, 0x8b, 0x7e, 0x2d, 0xcf, 0xb0, 0x8e, 0xdb, 0xe7, 0xb6, 0xef, 0x84, 0x3d, 0x6a, 0xd9,
+	0x4b, 0x92, 0x70, 0xe0, 0x84, 0x3d, 0xb6, 0x01, 0x8b, 0xbe, 0xec, 0xc5, 0xbd, 0x51, 0x80, 0x0c,
+	0x79, 0xc5, 0x50, 0x8e, 0x88, 0x8a, 0x49, 0x1e, 0xd0, 0x4e, 0xc0, 0xbf, 0xfc, 0xb6, 0xdd, 0xf2,
+	0x86, 0x21, 0xa7, 0x09, 0x5d, 0x1e, 0xd0, 0x8a, 0xda, 0x40, 0x22, 0xbb, 0x0b, 0x15, 0xfe, 0x8c,
+	0xb7, 0x46, 0x21, 0xb7, 0xa5, 0xfc, 0x41, 0x84, 0x70, 0xc9, 0x5a, 0x26, 0xfa, 0x0e, 0x91, 0xe5,
+	0xb6, 0xee, 0xb0, 0xc3, 0xc5, 0x58, 0x20, 0xf6, 0xa2, 0x65, 0x45, 0x24, 0x79, 0xe6, 0x53, 0x80,
+	0x89, 0x39, 0x0c, 0xa0, 0xd8, 0xb0, 0x9a, 0x0f, 0x8f, 0x24, 0xa6, 0x4b, 0x00, 0xf8, 0xb7, 0xbd,
+	0xfd, 0xc8, 0xaa, 0x18, 0x72, 0xed, 0xe9, 0xc1, 0xb6, 0x5c, 0xcb, 0x49, 0xe4, 0xf7, 0xf6, 0xbf,
+	0xdd, 0xac, 0xe4, 0x25, 0x75, 0xbb, 0xf9, 0x6e, 0xf3, 0xa8, 0x59, 0x29, 0x48, 0x2f, 0x34, 0x76,
+	0xf7, 0xf6, 0xb7, 0x2b, 0xb3, 0x72, 0x94, 0xbd, 0x96, 0x09, 0x21, 0x7b, 0x07, 0x8a, 0x3d, 0x05,
+	0x23, 0x05, 0xf8, 0xc6, 0x39, 0x10, 0xdf, 0x9d, 0xb1, 0xe8, 0x47, 0xac, 0x06, 0x73, 0x91, 0x39,
+	0x0a, 0xe6, 0xdd, 0x19, 0x2b, 0x22, 0x6c, 0x99, 0xb0, 0x2e, 0x6b, 0x89, 0x4d, 0x71, 0x2d, 0xf1,
+	0x09, 0x6c, 0x74, 0x90, 0xed, 0x3b, 0xa7, 0x7d, 0xcf, 0x69, 0x9b, 0x7f, 0xc8, 0xc3, 0xcd, 0xc4,
+	0x4e, 0x54, 0xde, 0x28, 0x22, 0x5e, 0x64, 0x91, 0x4b, 0x54, 0xae, 0x7c, 0xaa, 0x72, 0xdd, 0x86,
+	0x25, 0x52, 0x3e, 0x2a, 0x60, 0x58, 0xdd, 0x16, 0x91, 0xba, 0x47, 0x65, 0xec, 0x4d, 0x60, 0xc4,
+	0xe6, 0x8c, 0xc2, 0x9e, 0x27, 0x50, 0x1c, 0xd6, 0xba, 0x0a, 0xae, 0x3c, 0x54, 0x0b, 0x4a, 0x68,
+	0x1d, 0xae, 0xe8, 0xdc, 0x7c, 0xe0, 0xb8, 0x7d, 0x2a, 0x7b, 0x2b, 0x71, 0xf6, 0xa6, 0x5c, 0xc8,
+	0x2e, 0x92, 0x73, 0xe7, 0x2f, 0x92, 0xa5, 0xf3, 0x17, 0xc9, 0xab, 0x30, 0xdb, 0xf1, 0x44, 0x8b,
+	0x57, 0xe7, 0x71, 0x4c, 0x52, 0x1f, 0x32, 0x99, 0x50, 0xa8, 0x1c, 0x00, 0x00, 0x1b, 0x42, 0x45,
+	0x38, 0xec, 0x39, 0xe6, 0xef, 0x68, 0x3e, 0x4c, 0x3b, 0x90, 0x7d, 0x2d, 0x11, 0x5a, 0xb7, 0xa6,
+	0x84, 0x96, 0xe6, 0xf0, 0x58, 0x6c, 0x7d, 0x65, 0x5c, 0x0c, 0x72, 0x7a, 0xed, 0xcd, 0x0e, 0xcd,
+	0x99, 0x28, 0xfb, 0xb7, 0x36, 0xe0, 0x8d, 0x74, 0xe0, 0x09, 0xdc, 0x65, 0x1c, 0x79, 0xbf, 0x89,
+	0x2e, 0x06, 0xe3, 0x8a, 0x5c, 0x60, 0xf1, 0x5f, 0x83, 0x05, 0x77, 0xd8, 0xe6, 0xcf, 0xb4, 0xb2,
+	0x0f, 0x8a, 0x74, 0x46, 0x39, 0x9f, 0x32, 0x85, 0xff, 0x93, 0xd2, 0xc4, 0xe2, 0xb2, 0xfc, 0x34,
+	0xbc, 0x61, 0xc7, 0x15, 0x03, 0xe7, 0xb8, 0xcf, 0x23, 0xac, 0x9b, 0x09, 0xac, 0xbf, 0xa0, 0xd7,
+	0xf7, 0xec, 0x5f, 0xd5, 0x53, 0x90, 0x5f, 0x8f, 0xe6, 0x64, 0x35, 0xb2, 0xec, 0xce, 0xd0, 0xa4,
+	0x5c, 0xfb, 0x63, 0x0e, 0x8a, 0x97, 0x90, 0x90, 0x37, 0x60, 0x5e, 0x28, 0x5d, 0x63, 0xa3, 0x07,
+	0x12, 0xce, 0x98, 0xfa, 0x57, 0x81, 0x52, 0x56, 0xc5, 0xe7, 0x2c, 0x0e, 0xa8, 0x48, 0x91, 0x03,
+	0xea, 0xd7, 0x61, 0x45, 0xf0, 0x81, 0x17, 0xf2, 0x78, 0x4e, 0x14, 0xa7, 0xe6, 0x44, 0x05, 0x99,
+	0x63, 0x49, 0xb1, 0x01, 0x8b, 0x24, 0x80, 0xb6, 0xc7, 0xdc, 0x2b, 0x23, 0x11, 0x23, 0x40, 0x4e,
+	0xad, 0x5d, 0x37, 0xb4, 0xfd, 0x51, 0xd0, 0xb3, 0x3d, 0x5f, 0x5d, 0x51, 0x57, 0x4b, 0xeb, 0xf9,
+	0xcd, 0x79, 0x6b, 0xa9, 0xeb, 0x86, 0x07, 0xa3, 0xa0, 0xb7, 0x8f, 0xd4, 0xad, 0xbb, 0x70, 0x47,
+	0x05, 0x27, 0x19, 0xda, 0x9a, 0x78, 0x25, 0x15, 0xa2, 0x7f, 0x35, 0x60, 0x75, 0x8a, 0xff, 0x28,
+	0x50, 0xd7, 0xa4, 0x33, 0x94, 0x1c, 0x69, 0xbb, 0x9a, 0x43, 0x77, 0x67, 0x2c, 0x02, 0x51, 0x5a,
+	0x7f, 0x07, 0x96, 0x88, 0x41, 0x3a, 0xd2, 0x8d, 0x86, 0xd1, 0xdd, 0x19, 0x6b, 0x11, 0xe9, 0x0f,
+	0x91, 0xfc, 0x3c, 0xd1, 0x28, 0xdd, 0xd4, 0x1d, 0x37, 0x2a, 0xd8, 0x80, 0x94, 0xba, 0xd4, 0xa5,
+	0x6c, 0xdd, 0x83, 0xcd, 0xe9, 0xf6, 0xa1, 0xda, 0x63, 0x03, 0x7f, 0x46, 0x7d, 0xed, 0xe1, 0x07,
+	0x23, 0x27, 0xb8, 0xac, 0xe1, 0x36, 0x50, 0x9b, 0xc5, 0x22, 0x0c, 0x09, 0x8f, 0xda, 0x7a, 0xa1,
+	0x9b, 0xd5, 0x0b, 0x9d, 0x6c, 0x20, 0xf9, 0xb0, 0xad, 0x96, 0x8a, 0x6a, 0xa9, 0xc8, 0x87, 0x6d,
+	0xb9, 0x70, 0x0b, 0x8a, 0x58, 0xc8, 0xa9, 0x1d, 0xd5, 0xb7, 0xa5, 0xb5, 0x8c, 0xa3, 0xa4, 0x94,
+	0x71, 0x94, 0x3c, 0x2e, 0x94, 0x0a, 0x95, 0x59, 0xd3, 0xc5, 0x96, 0x34, 0x82, 0x65, 0x7c, 0xdb,
+	0x07, 0xa4, 0xfb, 0xd8, 0xd9, 0x16, 0x59, 0x23, 0xf5, 0xd0, 0xbc, 0x92, 0xd7, 0xbd, 0x82, 0x37,
+	0x48, 0x56, 0xda, 0xc5, 0xe6, 0xaf, 0x68, 0x5e, 0x96, 0x71, 0x70, 0x7a, 0xe0, 0x84, 0x93, 0x3b,
+	0x86, 0x33, 0xcb, 0x77, 0x8a, 0xbd, 0x9e, 0xd5, 0x1a, 0xf8, 0x92, 0x81, 0x07, 0x93, 0xd6, 0x80,
+	0x08, 0xb5, 0x9f, 0x1a, 0x97, 0x52, 0x4f, 0x36, 0x60, 0x91, 0x2e, 0xa1, 0x28, 0x75, 0xa9, 0xd3,
+	0x43, 0x22, 0xa6, 0xee, 0xb8, 0x4d, 0x51, 0x95, 0xce, 0x56, 0x1a, 0xa6, 0x32, 0xf1, 0x7d, 0x3c,
+	0xe4, 0xe2, 0x56, 0x5f, 0xdc, 0x51, 0x61, 0xfe, 0xcb, 0x80, 0xda, 0xe4, 0xc5, 0xe2, 0x70, 0x74,
+	0x3c, 0xf0, 0xda, 0xa3, 0x49, 0x6d, 0x7f, 0xc1, 0xb7, 0x7b, 0x14, 0x96, 0xb1, 0xdb, 0x3d, 0xa4,
+	0x9c, 0x75, 0xbb, 0x77, 0x13, 0xe6, 0x83, 0x48, 0xcd, 0xe8, 0x72, 0x6f, 0x4c, 0xc8, 0x88, 0xf5,
+	0x62, 0x46, 0xac, 0x9b, 0x7f, 0x32, 0x70, 0x18, 0x48, 0x99, 0xfd, 0x72, 0xae, 0x8e, 0x52, 0x23,
+	0x58, 0x21, 0x35, 0x82, 0x3d, 0x2e, 0x94, 0xf2, 0x95, 0x82, 0x95, 0x9e, 0xea, 0x1e, 0xfc, 0x1d,
+	0xa0, 0x32, 0xd6, 0xe7, 0x90, 0x8b, 0x13, 0xb7, 0xc5, 0xd9, 0xf7, 0xa0, 0x92, 0x7c, 0xc1, 0x63,
+	0x6b, 0x5a, 0x13, 0x93, 0x7e, 0x94, 0xac, 0xad, 0x4f, 0x67, 0x40, 0x5c, 0xcc, 0xe2, 0x7f, 0x7e,
+	0xb1, 0x99, 0x2b, 0x19, 0x91, 0xf8, 0xf8, 0x3b, 0x97, 0x2e, 0x3e, 0xe3, 0x25, 0x4f, 0x17, 0x9f,
+	0xf5, 0x44, 0x96, 0x14, 0x1f, 0x7f, 0x65, 0xd2, 0xc5, 0x67, 0xbc, 0x8b, 0xe9, 0xe2, 0xb3, 0x1e,
+	0xa8, 0xc6, 0xe2, 0x8f, 0x60, 0x51, 0x7b, 0xd4, 0x60, 0x37, 0xd3, 0x86, 0x4f, 0x5e, 0x6f, 0x6a,
+	0xab, 0x53, 0x56, 0xb3, 0xa5, 0x8e, 0x9f, 0x90, 0x74, 0xa9, 0xc9, 0x87, 0x2e, 0x5d, 0x6a, 0xea,
+	0xdd, 0x69, 0x2c, 0xf5, 0x3b, 0xb0, 0xa4, 0xdf, 0x34, 0x33, 0xed, 0x87, 0xa9, 0x0b, 0xf9, 0xda,
+	0xe7, 0xa6, 0x2d, 0x27, 0x04, 0x7f, 0x1f, 0x96, 0x13, 0x0f, 0x10, 0x2c, 0xfd, 0x53, 0x1d, 0xe1,
+	0xb5, 0xa9, 0xeb, 0xba, 0xec, 0x4d, 0xe3, 0x2d, 0x83, 0x7d, 0x0b, 0xca, 0xf1, 0x5b, 0x59, 0x76,
+	0x23, 0xfe, 0xe3, 0xc4, 0xa5, 0x72, 0xed, 0x66, 0xf6, 0x62, 0x36, 0x16, 0x93, 0x0b, 0x30, 0x1d,
+	0x8b, 0xd4, 0xbd, 0xab, 0x8e, 0x45, 0xfa, 0xde, 0x6c, 0x2c, 0xf8, 0x7d, 0xc4, 0x22, 0xd6, 0x8f,
+	0xeb, 0x58, 0xa4, 0x27, 0x06, 0x1d, 0x8b, 0x8c, 0x46, 0x7e, 0x82, 0x05, 0xf3, 0xf1, 0x98, 0x4b,
+	0xb5, 0x52, 0xec, 0xd6, 0x79, 0x3a, 0xe5, 0xda, 0xed, 0x4f, 0xe0, 0xca, 0xc0, 0xfe, 0x9b, 0x00,
+	0x93, 0xcb, 0x15, 0xf6, 0x7a, 0xd6, 0x85, 0x0b, 0xca, 0xae, 0x4d, 0xbf, 0x8b, 0x19, 0x83, 0x43,
+	0xc2, 0xb0, 0x23, 0xd0, 0x85, 0x69, 0xcd, 0x93, 0x2e, 0x4c, 0x6f, 0x20, 0xc6, 0xc2, 0xde, 0x43,
+	0x17, 0x4e, 0x4e, 0x33, 0xdd, 0x85, 0xa9, 0xb3, 0x5d, 0x77, 0x61, 0xfa, 0x10, 0x8c, 0xc1, 0xdc,
+	0xc1, 0xf7, 0x8a, 0x44, 0x49, 0x67, 0x66, 0xba, 0xea, 0x24, 0x8f, 0xb9, 0xda, 0xc6, 0x99, 0x3c,
+	0xfa, 0x4e, 0x5b, 0x6f, 0x7d, 0x57, 0x72, 0xf7, 0x9d, 0xe3, 0x7a, 0xcb, 0x1b, 0xdc, 0xc7, 0x3f,
+	0xbf, 0xe8, 0x89, 0xee, 0x7d, 0x94, 0x71, 0x5f, 0xfd, 0xf3, 0xc7, 0xfd, 0xae, 0x47, 0xdf, 0xfe,
+	0xf1, 0x71, 0x51, 0x91, 0xbe, 0xf4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x39, 0xc9, 0x90,
+	0x45, 0x22, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/operations.proto b/proto/operations.proto
index 8bfd352a6..30305d289 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -219,6 +219,7 @@ message UserCherryPickRequest {
   bytes message = 5;
   bytes start_branch_name = 6;
   Repository start_repository = 7;
+  bool dry_run = 8;
 }
 
 message UserCherryPickResponse {
@@ -243,6 +244,7 @@ message UserRevertRequest {
   bytes message = 5;
   bytes start_branch_name = 6;
   Repository start_repository = 7;
+  bool dry_run = 8;
 }
 
 message UserRevertResponse {
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index a6cd3f13d..f85ba5c9c 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -168,7 +168,8 @@ module GitalyServer
         branch_name: request.branch_name,
         message: request.message.dup,
         start_branch_name: request.start_branch_name.presence,
-        start_repository: start_repository
+        start_repository: start_repository,
+        dry_run: request.dry_run
       )
 
       branch_update = branch_update_result(result)
@@ -196,7 +197,8 @@ module GitalyServer
         branch_name: request.branch_name,
         message: request.message.dup,
         start_branch_name: request.start_branch_name.presence,
-        start_repository: start_repository
+        start_repository: start_repository,
+        dry_run: request.dry_run
       )
 
       branch_update = branch_update_result(result)
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index 540e61a18..43c0b2a85 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -321,7 +321,7 @@ module Gitlab
         raise ArgumentError, 'Invalid merge source'
       end
 
-      def revert(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
+      def revert(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:, dry_run: false)
         OperationService.new(user, self).with_branch(
           branch_name,
           start_branch_name: start_branch_name,
@@ -330,24 +330,35 @@ module Gitlab
 
           revert_tree_id = check_revert_content(commit, start_commit.sha)
 
-          committer = user_to_committer(user)
-
-          create_commit(message: message,
-                        author: committer,
-                        committer: committer,
-                        tree: revert_tree_id,
-                        parents: [start_commit.sha])
+          if dry_run
+            # At this point the tree has been written to the object database but
+            # not committed, so we'll leave it to be cleaned up by `gc`.
+            #
+            # The response expects a SHA, so just return the starting one.
+            start_commit.sha
+          else
+            committer = user_to_committer(user)
+
+            create_commit(
+              message: message,
+              author: committer,
+              committer: committer,
+              tree: revert_tree_id,
+              parents: [start_commit.sha]
+            )
+          end
         end
       end
 
-      def cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
+      def cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:, dry_run: false)
         args = {
           user: user,
           commit: commit,
           branch_name: branch_name,
           message: message,
           start_branch_name: start_branch_name,
-          start_repository: start_repository
+          start_repository: start_repository,
+          dry_run: dry_run
         }
 
         rugged_cherry_pick(args)
@@ -822,7 +833,7 @@ module Gitlab
         raise GitError, "Could not delete refs #{ref_names}: #{message}" unless status.zero?
       end
 
-      def rugged_cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:)
+      def rugged_cherry_pick(user:, commit:, branch_name:, message:, start_branch_name:, start_repository:, dry_run: false)
         OperationService.new(user, self).with_branch(
           branch_name,
           start_branch_name: start_branch_name,
@@ -831,17 +842,27 @@ module Gitlab
 
           cherry_pick_tree_id = check_cherry_pick_content(commit, start_commit.sha)
 
-          committer = user_to_committer(user)
-
-          create_commit(message: message,
-                        author: {
-                          email: commit.author_email,
-                          name: commit.author_name,
-                          time: commit.authored_date
-                        },
-                        committer: committer,
-                        tree: cherry_pick_tree_id,
-                        parents: [start_commit.sha])
+          if dry_run
+            # At this point the tree has been written to the object database but
+            # not committed, so we'll leave it to be cleaned up by `gc`.
+            #
+            # The response expects a SHA, so just return the starting one.
+            start_commit.sha
+          else
+            committer = user_to_committer(user)
+
+            create_commit(
+              message: message,
+              author: {
+                email: commit.author_email,
+                name: commit.author_name,
+                time: commit.authored_date
+              },
+              committer: committer,
+              tree: cherry_pick_tree_id,
+              parents: [start_commit.sha]
+            )
+          end
         end
       end
 
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index f021c8817..993eb5c56 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -103,6 +103,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :message, :bytes, 5
     optional :start_branch_name, :bytes, 6
     optional :start_repository, :message, 7, "gitaly.Repository"
+    optional :dry_run, :bool, 8
   end
   add_message "gitaly.UserCherryPickResponse" do
     optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"
@@ -124,6 +125,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :message, :bytes, 5
     optional :start_branch_name, :bytes, 6
     optional :start_repository, :message, 7, "gitaly.Repository"
+    optional :dry_run, :bool, 8
   end
   add_message "gitaly.UserRevertResponse" do
     optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"