Supply an argument to CreateTreeError

This will allow us to see why a cherry pick or revert failed, such as
because there was a conflict, or an empty commit.

8 files changed, 282 insertions, 154 deletions

diff --git a/changelogs/unreleased/rs-more-cherry-pick-feedback.yml b/changelogs/unreleased/rs-more-cherry-pick-feedback.yml
new file mode 100644
index 000000000..dc7e856ed
--- /dev/null
+++ b/changelogs/unreleased/rs-more-cherry-pick-feedback.yml
@@ -0,0 +1,5 @@
+---
+title: Provide specifics about why a cherry-pick or revert has failed
+merge_request: 1543
+author:
+type: changed
diff --git a/internal/service/operations/cherry_pick_test.go b/internal/service/operations/cherry_pick_test.go
index d613f8a49..6cb026769 100644
--- a/internal/service/operations/cherry_pick_test.go
+++ b/internal/service/operations/cherry_pick_test.go
@@ -117,6 +117,8 @@ func TestSuccessfulUserCherryPickRequest(t *testing.T) {
 			expectedBranchUpdate.CommitId = headCommit.Id
 
 			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])
 		})
@@ -351,7 +353,8 @@ func TestFailedUserCherryPickRequestDueToCreateTreeError(t *testing.T) {
 
 	response, err := client.UserCherryPick(ctx, request)
 	require.NoError(t, err)
-	require.Equal(t, "Gitlab::Git::Repository::CreateTreeError", response.CreateTreeError)
+	require.NotEmpty(t, response.CreateTreeError)
+	require.Equal(t, gitalypb.UserCherryPickResponse_EMPTY, response.CreateTreeErrorCode)
 }
 
 func TestFailedUserCherryPickRequestDueToCommitError(t *testing.T) {
diff --git a/internal/service/operations/revert_test.go b/internal/service/operations/revert_test.go
index 93d655f74..6a96c4313 100644
--- a/internal/service/operations/revert_test.go
+++ b/internal/service/operations/revert_test.go
@@ -114,6 +114,8 @@ func TestSuccessfulUserRevertRequest(t *testing.T) {
 			expectedBranchUpdate.CommitId = headCommit.Id
 
 			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])
 		})
@@ -348,7 +350,8 @@ func TestFailedUserRevertRequestDueToCreateTreeError(t *testing.T) {
 
 	response, err := client.UserRevert(ctx, request)
 	require.NoError(t, err)
-	require.Equal(t, "Gitlab::Git::Repository::CreateTreeError", response.CreateTreeError)
+	require.NotEmpty(t, response.CreateTreeError)
+	require.Equal(t, gitalypb.UserRevertResponse_CONFLICT, response.CreateTreeErrorCode)
 }
 
 func TestFailedUserRevertRequestDueToCommitError(t *testing.T) {
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index 089c6ad30..ac358ee14 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -24,6 +24,62 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
+type UserCherryPickResponse_CreateTreeError int32
+
+const (
+	UserCherryPickResponse_NONE     UserCherryPickResponse_CreateTreeError = 0
+	UserCherryPickResponse_EMPTY    UserCherryPickResponse_CreateTreeError = 1
+	UserCherryPickResponse_CONFLICT UserCherryPickResponse_CreateTreeError = 2
+)
+
+var UserCherryPickResponse_CreateTreeError_name = map[int32]string{
+	0: "NONE",
+	1: "EMPTY",
+	2: "CONFLICT",
+}
+
+var UserCherryPickResponse_CreateTreeError_value = map[string]int32{
+	"NONE":     0,
+	"EMPTY":    1,
+	"CONFLICT": 2,
+}
+
+func (x UserCherryPickResponse_CreateTreeError) String() string {
+	return proto.EnumName(UserCherryPickResponse_CreateTreeError_name, int32(x))
+}
+
+func (UserCherryPickResponse_CreateTreeError) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_1b4a5877375e491e, []int{18, 0}
+}
+
+type UserRevertResponse_CreateTreeError int32
+
+const (
+	UserRevertResponse_NONE     UserRevertResponse_CreateTreeError = 0
+	UserRevertResponse_EMPTY    UserRevertResponse_CreateTreeError = 1
+	UserRevertResponse_CONFLICT UserRevertResponse_CreateTreeError = 2
+)
+
+var UserRevertResponse_CreateTreeError_name = map[int32]string{
+	0: "NONE",
+	1: "EMPTY",
+	2: "CONFLICT",
+}
+
+var UserRevertResponse_CreateTreeError_value = map[string]int32{
+	"NONE":     0,
+	"EMPTY":    1,
+	"CONFLICT": 2,
+}
+
+func (x UserRevertResponse_CreateTreeError) String() string {
+	return proto.EnumName(UserRevertResponse_CreateTreeError_name, int32(x))
+}
+
+func (UserRevertResponse_CreateTreeError) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_1b4a5877375e491e, []int{20, 0}
+}
+
 type UserCommitFilesActionHeader_ActionType int32
 
 const (
@@ -1133,13 +1189,14 @@ func (m *UserCherryPickRequest) GetStartRepository() *Repository {
 }
 
 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"`
-	CommitError          string                 `protobuf:"bytes,3,opt,name=commit_error,json=commitError,proto3" json:"commit_error,omitempty"`
-	PreReceiveError      string                 `protobuf:"bytes,4,opt,name=pre_receive_error,json=preReceiveError,proto3" json:"pre_receive_error,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_unrecognized     []byte                 `json:"-"`
-	XXX_sizecache        int32                  `json:"-"`
+	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"`
+	CommitError          string                                 `protobuf:"bytes,3,opt,name=commit_error,json=commitError,proto3" json:"commit_error,omitempty"`
+	PreReceiveError      string                                 `protobuf:"bytes,4,opt,name=pre_receive_error,json=preReceiveError,proto3" json:"pre_receive_error,omitempty"`
+	CreateTreeErrorCode  UserCherryPickResponse_CreateTreeError `protobuf:"varint,5,opt,name=create_tree_error_code,json=createTreeErrorCode,proto3,enum=gitaly.UserCherryPickResponse_CreateTreeError" json:"create_tree_error_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                               `json:"-"`
+	XXX_unrecognized     []byte                                 `json:"-"`
+	XXX_sizecache        int32                                  `json:"-"`
 }
 
 func (m *UserCherryPickResponse) Reset()         { *m = UserCherryPickResponse{} }
@@ -1195,6 +1252,13 @@ func (m *UserCherryPickResponse) GetPreReceiveError() string {
 	return ""
 }
 
+func (m *UserCherryPickResponse) GetCreateTreeErrorCode() UserCherryPickResponse_CreateTreeError {
+	if m != nil {
+		return m.CreateTreeErrorCode
+	}
+	return UserCherryPickResponse_NONE
+}
+
 type UserRevertRequest struct {
 	Repository           *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
 	User                 *User       `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
@@ -1283,13 +1347,14 @@ func (m *UserRevertRequest) GetStartRepository() *Repository {
 }
 
 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"`
-	CommitError          string                 `protobuf:"bytes,3,opt,name=commit_error,json=commitError,proto3" json:"commit_error,omitempty"`
-	PreReceiveError      string                 `protobuf:"bytes,4,opt,name=pre_receive_error,json=preReceiveError,proto3" json:"pre_receive_error,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_unrecognized     []byte                 `json:"-"`
-	XXX_sizecache        int32                  `json:"-"`
+	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"`
+	CommitError          string                             `protobuf:"bytes,3,opt,name=commit_error,json=commitError,proto3" json:"commit_error,omitempty"`
+	PreReceiveError      string                             `protobuf:"bytes,4,opt,name=pre_receive_error,json=preReceiveError,proto3" json:"pre_receive_error,omitempty"`
+	CreateTreeErrorCode  UserRevertResponse_CreateTreeError `protobuf:"varint,5,opt,name=create_tree_error_code,json=createTreeErrorCode,proto3,enum=gitaly.UserRevertResponse_CreateTreeError" json:"create_tree_error_code,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
 }
 
 func (m *UserRevertResponse) Reset()         { *m = UserRevertResponse{} }
@@ -1345,6 +1410,13 @@ func (m *UserRevertResponse) GetPreReceiveError() string {
 	return ""
 }
 
+func (m *UserRevertResponse) GetCreateTreeErrorCode() UserRevertResponse_CreateTreeError {
+	if m != nil {
+		return m.CreateTreeErrorCode
+	}
+	return UserRevertResponse_NONE
+}
+
 type UserCommitFilesActionHeader struct {
 	Action          UserCommitFilesActionHeader_ActionType `protobuf:"varint,1,opt,name=action,proto3,enum=gitaly.UserCommitFilesActionHeader_ActionType" json:"action,omitempty"`
 	FilePath        []byte                                 `protobuf:"bytes,2,opt,name=file_path,json=filePath,proto3" json:"file_path,omitempty"`
@@ -2619,6 +2691,8 @@ func (m *UserUpdateSubmoduleResponse) GetCommitError() string {
 }
 
 func init() {
+	proto.RegisterEnum("gitaly.UserCherryPickResponse_CreateTreeError", UserCherryPickResponse_CreateTreeError_name, UserCherryPickResponse_CreateTreeError_value)
+	proto.RegisterEnum("gitaly.UserRevertResponse_CreateTreeError", UserRevertResponse_CreateTreeError_name, UserRevertResponse_CreateTreeError_value)
 	proto.RegisterEnum("gitaly.UserCommitFilesActionHeader_ActionType", UserCommitFilesActionHeader_ActionType_name, UserCommitFilesActionHeader_ActionType_value)
 	proto.RegisterType((*UserCreateBranchRequest)(nil), "gitaly.UserCreateBranchRequest")
 	proto.RegisterType((*UserCreateBranchResponse)(nil), "gitaly.UserCreateBranchResponse")
@@ -2663,137 +2737,141 @@ func init() {
 func init() { proto.RegisterFile("operations.proto", fileDescriptor_1b4a5877375e491e) }
 
 var fileDescriptor_1b4a5877375e491e = []byte{
-	// 2065 bytes of a gzipped FileDescriptorProto
+	// 2139 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x23, 0x49,
-	0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0xbc, 0x38, 0x89, 0x53, 0xbb, 0x3b, 0x9b, 0xf5, 0x4c, 0x48, 0xb6,
-	0x33, 0xc3, 0x64, 0x06, 0xf0, 0x7c, 0x80, 0x40, 0x42, 0x5a, 0xd0, 0x24, 0x71, 0xc8, 0xae, 0x98,
-	0x9d, 0xd0, 0xc9, 0x80, 0xb4, 0x42, 0x34, 0x1d, 0xbb, 0x6c, 0xb7, 0xb0, 0xdd, 0xde, 0xea, 0x76,
+	0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0xbc, 0x38, 0x89, 0x53, 0xb3, 0x3b, 0xeb, 0xf5, 0x4c, 0x98, 0x6c,
+	0x67, 0x86, 0xc9, 0x0c, 0xe0, 0xf9, 0x60, 0x05, 0x12, 0xd2, 0x82, 0x26, 0x8e, 0x43, 0x66, 0xb5,
+	0xf9, 0xa0, 0xe3, 0x01, 0xb1, 0x42, 0x34, 0x1d, 0xbb, 0x6c, 0xb7, 0xb0, 0xdd, 0xde, 0xea, 0x76,
 	0x98, 0x70, 0x40, 0x48, 0x48, 0x2c, 0x47, 0x4e, 0x2c, 0x17, 0x24, 0x38, 0x21, 0x21, 0x2e, 0x5c,
-	0x10, 0xe2, 0x80, 0x90, 0x38, 0xc1, 0x75, 0x0f, 0xdc, 0xf8, 0x13, 0xb8, 0x20, 0x2e, 0x7b, 0x42,
-	0x55, 0xef, 0xb5, 0x5d, 0xd5, 0x1f, 0x21, 0x59, 0x12, 0xcd, 0x80, 0xf6, 0xe6, 0x7e, 0x55, 0xf5,
-	0xea, 0xbd, 0xdf, 0xfb, 0xac, 0x2a, 0x43, 0x2d, 0x18, 0x71, 0xe1, 0x45, 0x7e, 0x30, 0x0c, 0x1b,
-	0x23, 0x11, 0x44, 0x01, 0x2b, 0x77, 0xfd, 0xc8, 0xeb, 0x9f, 0xd6, 0xab, 0x61, 0xcf, 0x13, 0xbc,
-	0x8d, 0x54, 0xfb, 0xb7, 0x16, 0xbc, 0xfa, 0x34, 0xe4, 0x62, 0x47, 0x70, 0x2f, 0xe2, 0xdb, 0xc2,
-	0x1b, 0xb6, 0x7a, 0x0e, 0x7f, 0x77, 0xcc, 0xc3, 0x88, 0x3d, 0x04, 0x10, 0x7c, 0x14, 0x84, 0x7e,
-	0x14, 0x88, 0xd3, 0x55, 0x6b, 0xc3, 0xda, 0x5a, 0x78, 0xc8, 0x1a, 0xc8, 0xa6, 0xe1, 0x4c, 0x46,
-	0x1c, 0x6d, 0x16, 0x5b, 0x87, 0x85, 0x63, 0xc5, 0xc4, 0x1d, 0x7a, 0x03, 0xbe, 0x5a, 0xd8, 0xb0,
-	0xb6, 0xaa, 0x0e, 0x20, 0xe9, 0x6d, 0x6f, 0xc0, 0xd9, 0x06, 0x94, 0xc6, 0x21, 0x17, 0xab, 0x45,
-	0xc5, 0xae, 0x1a, 0xb3, 0x93, 0x32, 0x38, 0x6a, 0x44, 0xb2, 0x08, 0x23, 0x4f, 0x44, 0xee, 0x28,
-	0xf0, 0x87, 0xd1, 0x6a, 0x09, 0x59, 0x28, 0xd2, 0x81, 0xa4, 0xd8, 0x43, 0x58, 0x4d, 0x8b, 0x1c,
-	0x8e, 0x82, 0x61, 0xc8, 0xd9, 0x27, 0xa1, 0x8c, 0x9b, 0x91, 0xbc, 0x4b, 0xf1, 0x06, 0x34, 0x8f,
-	0x46, 0xd9, 0x5d, 0x58, 0x19, 0x09, 0xee, 0x0a, 0xde, 0xe2, 0xfe, 0x09, 0x77, 0xb9, 0x10, 0x81,
-	0x50, 0xd2, 0xce, 0x3b, 0xcb, 0x23, 0xc1, 0x1d, 0xa4, 0x37, 0x25, 0xd9, 0xfe, 0x13, 0x61, 0xf4,
-	0x74, 0xd4, 0x7e, 0x51, 0x30, 0xba, 0x06, 0xe5, 0x21, 0xff, 0xae, 0xe0, 0x27, 0x04, 0x0f, 0x7d,
-	0x49, 0x7a, 0xd0, 0x6f, 0x4b, 0xfa, 0x2c, 0xd2, 0xf1, 0xcb, 0xde, 0x43, 0xc8, 0x4c, 0x0d, 0x08,
-	0xb2, 0x4c, 0x28, 0xac, 0x6c, 0x28, 0x7e, 0x42, 0x50, 0xec, 0xf2, 0x3e, 0x7f, 0x31, 0xa0, 0x88,
-	0x55, 0x33, 0x25, 0xfa, 0x08, 0xaa, 0xbd, 0x67, 0xc1, 0xcb, 0x53, 0x46, 0x47, 0x5e, 0xf7, 0xbf,
-	0xd1, 0xeb, 0x35, 0xa8, 0x44, 0x5e, 0x57, 0x57, 0x6a, 0x2e, 0xf2, 0xba, 0xe7, 0xd4, 0x68, 0x07,
-	0x5e, 0x49, 0x08, 0xf2, 0x11, 0xd4, 0xf9, 0x2b, 0xa9, 0x83, 0x51, 0xf2, 0x1c, 0xd5, 0x61, 0xb7,
-	0x61, 0x39, 0xf2, 0x44, 0x97, 0x47, 0xae, 0xe0, 0x27, 0x7e, 0xe8, 0x07, 0x43, 0x72, 0xda, 0x25,
-	0x24, 0x3b, 0x44, 0x65, 0xab, 0x30, 0x37, 0xe0, 0x61, 0xe8, 0x75, 0x39, 0x79, 0x6f, 0xfc, 0x69,
-	0x7f, 0x0f, 0x11, 0xd1, 0x74, 0x21, 0x44, 0xd6, 0xa0, 0x18, 0x79, 0x5d, 0xd2, 0x62, 0x21, 0xde,
-	0x5c, 0xce, 0x90, 0x74, 0x19, 0x0e, 0xfc, 0x99, 0x1f, 0x46, 0xa1, 0x92, 0xba, 0xe2, 0xd0, 0x57,
-	0x36, 0x90, 0xc5, 0x6c, 0x20, 0x3f, 0xb0, 0xe0, 0x9a, 0xdc, 0xfc, 0x31, 0x17, 0xdd, 0x4b, 0xf0,
-	0xf8, 0x18, 0xaf, 0x42, 0x2e, 0x5e, 0xd7, 0x61, 0xbe, 0x15, 0x0c, 0x06, 0x7e, 0xe4, 0xfa, 0x6d,
-	0x12, 0xaa, 0x82, 0x84, 0x37, 0xdb, 0x52, 0x23, 0xca, 0x6f, 0x14, 0xf8, 0x94, 0xcf, 0x72, 0xb1,
-	0x63, 0x2f, 0xc3, 0xac, 0x37, 0x1a, 0xf5, 0x4f, 0x57, 0xcb, 0x0a, 0x02, 0xfc, 0xb0, 0x7f, 0x43,
-	0x81, 0x6c, 0x68, 0x45, 0xa0, 0x1a, 0x02, 0x58, 0x09, 0x01, 0xb6, 0x61, 0x91, 0x22, 0x76, 0xac,
-	0x92, 0x09, 0x19, 0x7e, 0x2d, 0x56, 0xe4, 0x49, 0x5c, 0x77, 0x90, 0x29, 0x66, 0x1c, 0xa7, 0x7a,
-	0xac, 0x7d, 0x65, 0xc3, 0x5f, 0xca, 0x84, 0xff, 0xad, 0x52, 0xa5, 0x50, 0x2b, 0xda, 0xef, 0x15,
-	0xd0, 0x03, 0x94, 0xb8, 0x47, 0x81, 0xc3, 0x3b, 0x57, 0x6b, 0x83, 0x35, 0x80, 0x30, 0x18, 0x8b,
-	0x16, 0x77, 0xc3, 0x9e, 0x47, 0x46, 0x98, 0x47, 0xca, 0x61, 0xcf, 0xcb, 0xb5, 0xc2, 0x1a, 0xc0,
-	0xc4, 0xd5, 0x3b, 0x64, 0x88, 0xf9, 0xd8, 0xcb, 0x3b, 0xba, 0x91, 0xca, 0xa6, 0x91, 0xb6, 0xa0,
-	0xd6, 0xf1, 0x45, 0x18, 0xb9, 0x23, 0x4f, 0xf0, 0x21, 0x2e, 0x9f, 0xc3, 0x20, 0x51, 0xf4, 0x03,
-	0x45, 0x76, 0x78, 0xc7, 0xf6, 0x34, 0x6f, 0x24, 0x20, 0xce, 0x63, 0xb6, 0x8b, 0xd4, 0xbb, 0xef,
-	0xc3, 0x2b, 0x99, 0x56, 0x3c, 0x7b, 0x87, 0xd7, 0xa1, 0x2a, 0x21, 0x76, 0x5b, 0x2a, 0x48, 0xdb,
-	0x14, 0x71, 0x0b, 0x92, 0x86, 0x71, 0xdb, 0x66, 0xb7, 0x60, 0x89, 0x7c, 0x27, 0x9e, 0x54, 0x54,
-	0x93, 0xc8, 0xa3, 0x68, 0x9a, 0xfd, 0x0b, 0x0b, 0x5e, 0x92, 0x3a, 0xee, 0xed, 0xbd, 0xa8, 0xe1,
-	0x66, 0xff, 0x88, 0xb2, 0xeb, 0x54, 0x44, 0x32, 0x42, 0x2a, 0x3c, 0xac, 0x4b, 0x0a, 0x8f, 0x1c,
-	0x5b, 0xfd, 0x91, 0x02, 0x63, 0xa7, 0xc7, 0x85, 0x38, 0x3d, 0xf0, 0x5b, 0xdf, 0xb9, 0x5a, 0xb4,
-	0xee, 0x40, 0x19, 0xc1, 0xa1, 0xb8, 0x5f, 0x89, 0xe7, 0x7c, 0xc5, 0x8f, 0x76, 0xd4, 0x80, 0x43,
-	0x13, 0x92, 0xb5, 0xbd, 0x94, 0xaa, 0xed, 0xf9, 0x39, 0xeb, 0x2e, 0xac, 0x60, 0x0b, 0xa8, 0x33,
-	0xc0, 0x90, 0x59, 0x56, 0x03, 0xdb, 0x53, 0x2e, 0x6f, 0x40, 0x0d, 0xe7, 0x6a, 0xda, 0xce, 0xe5,
-	0x6a, 0x8b, 0xcb, 0xa7, 0x04, 0xfb, 0x6f, 0x94, 0xde, 0x75, 0x00, 0x2f, 0xd7, 0x96, 0xe8, 0xeb,
-	0x6e, 0x24, 0x78, 0xc2, 0x96, 0x38, 0x70, 0x24, 0x38, 0xda, 0x52, 0x46, 0x10, 0x79, 0xa2, 0x5e,
-	0x90, 0x16, 0x90, 0x86, 0x53, 0x2e, 0x90, 0x39, 0xed, 0x3f, 0x14, 0x60, 0x45, 0x59, 0x8e, 0x9f,
-	0x70, 0xa9, 0xf2, 0xc7, 0x6e, 0x71, 0x01, 0xb7, 0xf8, 0xc0, 0x02, 0xa6, 0x83, 0xf7, 0xff, 0xe1,
-	0x12, 0xff, 0x2a, 0xc0, 0x75, 0xe5, 0xec, 0x6a, 0xfd, 0x9e, 0xdf, 0xe7, 0xe1, 0xa3, 0x96, 0x14,
-	0x77, 0x9f, 0x7b, 0x6d, 0x2e, 0xd8, 0x1e, 0x94, 0x3d, 0xf5, 0xad, 0xf4, 0x5a, 0x7a, 0xd8, 0xd0,
-	0x4d, 0x9d, 0xb3, 0xa8, 0x81, 0x1f, 0x47, 0xa7, 0x23, 0xee, 0xd0, 0x6a, 0x99, 0x53, 0x3b, 0x7e,
-	0x9f, 0xbb, 0x23, 0x2f, 0xea, 0x51, 0xc3, 0x58, 0x91, 0x84, 0x03, 0x2f, 0xea, 0xb1, 0x4d, 0x58,
-	0x1c, 0xc9, 0x4e, 0x30, 0x18, 0x87, 0x38, 0xa1, 0xa8, 0x26, 0x54, 0x63, 0xa2, 0x9a, 0x24, 0x4b,
-	0x85, 0x17, 0xf2, 0xcf, 0x7f, 0xce, 0x6d, 0x05, 0xc3, 0x88, 0xd3, 0x39, 0x50, 0x96, 0x0a, 0x45,
-	0xdd, 0x41, 0x22, 0xbb, 0x03, 0x35, 0xfe, 0x8c, 0xb7, 0xc6, 0x11, 0x77, 0x25, 0xff, 0x41, 0xd0,
-	0x46, 0xa7, 0xa9, 0x38, 0xcb, 0x44, 0xdf, 0x23, 0xb2, 0xdc, 0xd6, 0x1f, 0x76, 0xb8, 0x98, 0x30,
-	0xc4, 0x7e, 0xa8, 0xaa, 0x88, 0xc4, 0xcf, 0x7e, 0x0a, 0x30, 0x55, 0x87, 0x01, 0x94, 0x77, 0x9c,
-	0xe6, 0xa3, 0xa3, 0x66, 0x6d, 0x86, 0x2d, 0x01, 0xe0, 0x6f, 0x77, 0xf7, 0x4d, 0xa7, 0x66, 0xc9,
-	0xb1, 0xa7, 0x07, 0xbb, 0x72, 0xac, 0xc0, 0x2a, 0x50, 0x7a, 0xfc, 0xe4, 0xeb, 0xcd, 0x5a, 0x51,
-	0x52, 0x77, 0x9b, 0x5f, 0x6d, 0x1e, 0x35, 0x6b, 0x25, 0x36, 0x0f, 0xb3, 0x3b, 0xfb, 0x8f, 0x9f,
-	0xec, 0xd6, 0x66, 0xed, 0x9f, 0x5a, 0x94, 0xa5, 0x93, 0x10, 0xb2, 0x37, 0xa0, 0xdc, 0x53, 0x30,
-	0x92, 0x27, 0x6d, 0x9e, 0x03, 0xf1, 0xfd, 0x19, 0x87, 0x16, 0xb1, 0x3a, 0xcc, 0xc5, 0xea, 0x28,
-	0x98, 0xf7, 0x67, 0x9c, 0x98, 0xb0, 0x6d, 0xc3, 0x86, 0x8c, 0x4d, 0x97, 0x1c, 0x48, 0xe2, 0x13,
-	0xba, 0x68, 0x20, 0x77, 0xe4, 0x9d, 0xf6, 0x03, 0xaf, 0x6d, 0xff, 0xbe, 0x08, 0x37, 0x12, 0x3b,
-	0x51, 0xa2, 0x20, 0x8f, 0xb8, 0x9a, 0x74, 0x91, 0xc8, 0x01, 0xc5, 0x54, 0x0e, 0xb8, 0x05, 0x4b,
-	0x24, 0x76, 0x9c, 0x0a, 0x30, 0x4f, 0x2c, 0x22, 0xf5, 0x31, 0x25, 0x84, 0x4f, 0x03, 0xa3, 0x69,
-	0xde, 0x38, 0xea, 0x05, 0x02, 0xd9, 0x61, 0xd6, 0xa8, 0xe1, 0xc8, 0x23, 0x35, 0xa0, 0x98, 0x36,
-	0xe0, 0x25, 0x73, 0x36, 0x1f, 0x78, 0x7e, 0x9f, 0x12, 0xc8, 0x8a, 0x3e, 0xbd, 0x29, 0x07, 0xb2,
-	0xd3, 0xcd, 0xdc, 0xf9, 0xd3, 0x4d, 0xe5, 0xdc, 0xe9, 0x46, 0x36, 0xe9, 0x9d, 0x40, 0xb4, 0xf8,
-	0xea, 0x3c, 0x36, 0xe9, 0xea, 0x43, 0x86, 0x11, 0x32, 0x95, 0x4d, 0x28, 0x60, 0x6b, 0xa2, 0x08,
-	0x87, 0x3d, 0xcf, 0xfe, 0x5d, 0x5c, 0xb8, 0x52, 0xa6, 0x63, 0x5f, 0x4a, 0x38, 0xd5, 0xcd, 0x1c,
-	0xa7, 0x32, 0x4c, 0xad, 0x79, 0xd5, 0x17, 0x26, 0x69, 0xa0, 0x60, 0xa6, 0xb7, 0x6c, 0xa7, 0x9c,
-	0x89, 0xe3, 0x7e, 0x7b, 0x13, 0x5e, 0x4f, 0xbb, 0x9c, 0xc0, 0x5d, 0x26, 0x3e, 0xf7, 0xeb, 0xf8,
-	0xca, 0x49, 0x17, 0xe4, 0x12, 0xf3, 0xeb, 0x3a, 0x2c, 0xf8, 0xc3, 0x36, 0x7f, 0x66, 0x64, 0x56,
-	0x50, 0xa4, 0x33, 0x32, 0x66, 0xce, 0xe9, 0xef, 0x57, 0x93, 0x22, 0x2a, 0x13, 0xcf, 0x95, 0x77,
-	0xa2, 0x42, 0x6d, 0xa3, 0x75, 0xa2, 0x48, 0x38, 0xe3, 0xe0, 0xb7, 0x06, 0x14, 0x37, 0xca, 0x49,
-	0x66, 0xf1, 0xa4, 0x82, 0x14, 0x79, 0x52, 0xf9, 0x32, 0xac, 0x08, 0x3e, 0x08, 0x22, 0xae, 0x3b,
-	0x66, 0x39, 0x57, 0xe0, 0x1a, 0x4e, 0xd6, 0x3c, 0x73, 0x13, 0x16, 0x89, 0x01, 0x6d, 0x8f, 0x01,
-	0x50, 0x45, 0x22, 0x9a, 0xe1, 0x8b, 0x85, 0x55, 0xcb, 0xfe, 0xc1, 0xa4, 0x62, 0x22, 0x52, 0x93,
-	0x13, 0x3a, 0x90, 0x52, 0x52, 0x3e, 0x3c, 0x34, 0x90, 0x9a, 0x52, 0xbe, 0x0b, 0xf4, 0xba, 0x12,
-	0x9f, 0x6e, 0xa2, 0x12, 0x56, 0xba, 0x54, 0x06, 0x95, 0x08, 0x7f, 0xa6, 0x6c, 0x86, 0x22, 0xec,
-	0x04, 0xc3, 0x8e, 0x2f, 0x06, 0xde, 0x71, 0x7f, 0x62, 0xb7, 0x66, 0x22, 0x30, 0x3e, 0x65, 0x58,
-	0x21, 0x67, 0x55, 0x23, 0x15, 0x1f, 0xd7, 0xe2, 0x23, 0xb5, 0x3a, 0xe3, 0xec, 0xcf, 0xd0, 0xa1,
-	0xba, 0xfe, 0xb3, 0x02, 0x94, 0xaf, 0x34, 0x6f, 0xfe, 0xcf, 0x7a, 0xc8, 0xf6, 0x1d, 0xb8, 0xad,
-	0x32, 0x03, 0x89, 0xdf, 0x9a, 0xa2, 0x9c, 0xca, 0x0f, 0x7f, 0xb7, 0x60, 0x2d, 0xc7, 0x1e, 0xe4,
-	0x53, 0xeb, 0x69, 0x9f, 0xda, 0x9f, 0xd1, 0xbd, 0xea, 0x36, 0x2c, 0xd1, 0x04, 0x69, 0x18, 0x3f,
-	0x3e, 0x8d, 0xee, 0xcf, 0x38, 0x8b, 0x48, 0x7f, 0x84, 0xe4, 0x8b, 0xa4, 0x02, 0xd3, 0xfd, 0x4a,
-	0xa6, 0xfb, 0x6d, 0xdf, 0x85, 0xad, 0x7c, 0xfd, 0x50, 0xec, 0x89, 0x82, 0xbf, 0xa4, 0x9c, 0x72,
-	0xf8, 0xee, 0xd8, 0x0b, 0xaf, 0xfe, 0x74, 0x1b, 0xaa, 0x6d, 0x34, 0x8f, 0x41, 0xc2, 0x19, 0x1e,
-	0x63, 0xd4, 0x9d, 0x59, 0xb3, 0xee, 0xb0, 0x57, 0x61, 0x8e, 0x0f, 0xdb, 0x6a, 0xa8, 0xac, 0x86,
-	0xca, 0x7c, 0xd8, 0x96, 0x03, 0x37, 0xa1, 0x8c, 0x75, 0x95, 0xfa, 0x6c, 0x53, 0x1c, 0x1a, 0xcb,
-	0xa8, 0xec, 0x95, 0x8c, 0xca, 0x6e, 0xfb, 0x98, 0x4c, 0x62, 0x88, 0xa6, 0xc9, 0x84, 0xb4, 0xd1,
-	0x92, 0x09, 0x52, 0xa4, 0x04, 0x67, 0x25, 0x08, 0xbc, 0x48, 0x72, 0xd2, 0xe6, 0xb6, 0x7f, 0x4e,
-	0x47, 0x68, 0xe9, 0x13, 0xa7, 0x07, 0x5e, 0x34, 0xbd, 0x70, 0x38, 0xb3, 0x8e, 0xa6, 0xa6, 0x37,
-	0xb2, 0xba, 0xb3, 0x91, 0x9c, 0xc0, 0xc3, 0x69, 0x77, 0x46, 0x84, 0xfa, 0x0f, 0xad, 0x2b, 0xce,
-	0x15, 0x9b, 0xb0, 0x48, 0x77, 0x51, 0x64, 0x63, 0x6a, 0xb3, 0x91, 0x48, 0x61, 0x19, 0xf7, 0x88,
-	0x2a, 0x7f, 0xb9, 0x4a, 0xb6, 0x54, 0x3c, 0x7e, 0x13, 0xfb, 0x0c, 0x5d, 0xdf, 0xcb, 0xab, 0xd6,
-	0xf6, 0x3f, 0x2c, 0xa8, 0x4f, 0x9f, 0x26, 0x0e, 0xc7, 0xc7, 0x83, 0xa0, 0x3d, 0xee, 0xf3, 0x2b,
-	0xbf, 0xde, 0x23, 0x27, 0xd4, 0xae, 0xf7, 0x90, 0x72, 0xd6, 0xf5, 0xde, 0x0d, 0x98, 0x0f, 0x63,
-	0x01, 0xe3, 0xdb, 0xbd, 0x09, 0x21, 0xc3, 0xb3, 0xcb, 0x59, 0x9e, 0xfd, 0x17, 0x0b, 0xcf, 0x60,
-	0x29, 0x85, 0x9f, 0xcf, 0x0d, 0x52, 0xea, 0x88, 0x59, 0x4a, 0x1d, 0x31, 0xdf, 0x2a, 0x55, 0x8a,
-	0xb5, 0x92, 0x93, 0x3e, 0xb5, 0x3e, 0xfc, 0xe7, 0x02, 0xd4, 0x26, 0xf2, 0x1c, 0x72, 0x71, 0xe2,
-	0xb7, 0x38, 0xfb, 0x36, 0xd4, 0x92, 0xcf, 0x73, 0x6c, 0xdd, 0xe8, 0x20, 0xd3, 0x6f, 0x8d, 0xf5,
-	0x8d, 0xfc, 0x09, 0x88, 0x8b, 0x3d, 0xff, 0xe1, 0xfb, 0x5b, 0xb3, 0x15, 0xab, 0x6e, 0x3d, 0x88,
-	0x77, 0xd0, 0x5f, 0xb3, 0xcc, 0x1d, 0x32, 0x5e, 0xea, 0xcc, 0x1d, 0xb2, 0x1e, 0xc2, 0x32, 0x76,
-	0xd0, 0x1f, 0x95, 0xcc, 0x1d, 0x32, 0x1e, 0xc0, 0xcc, 0x1d, 0xb2, 0xde, 0xa3, 0xf4, 0x1d, 0xbe,
-	0x01, 0x8b, 0xc6, 0x93, 0x06, 0xbb, 0x91, 0x46, 0x60, 0xfa, 0x6a, 0x53, 0x5f, 0xcb, 0x19, 0xcd,
-	0x65, 0x3c, 0x79, 0x3d, 0x32, 0x19, 0x27, 0x5f, 0xb7, 0x4c, 0xc6, 0xa9, 0x27, 0x27, 0x9d, 0xf1,
-	0x3b, 0xb0, 0x64, 0xde, 0x3c, 0x33, 0x63, 0x6d, 0xea, 0x6a, 0xbe, 0xfe, 0x89, 0xbc, 0xe1, 0x34,
-	0x6f, 0x0f, 0x96, 0x13, 0xaf, 0x11, 0x2c, 0xbd, 0xda, 0x44, 0x7b, 0x3d, 0x77, 0x3c, 0xc5, 0x7e,
-	0xcb, 0xba, 0x6f, 0xb1, 0x23, 0xa8, 0xea, 0x37, 0xb6, 0xec, 0xba, 0xbe, 0x3e, 0x71, 0xd5, 0x5c,
-	0xbf, 0x91, 0x3d, 0x98, 0x0b, 0xca, 0xf4, 0xf6, 0xd0, 0x04, 0x25, 0x75, 0x2d, 0x6b, 0x82, 0x92,
-	0xbe, 0x74, 0xcc, 0x00, 0x45, 0x3b, 0x27, 0x99, 0xa0, 0xa4, 0x4f, 0x72, 0x26, 0x28, 0x19, 0x07,
-	0x2c, 0x7b, 0xe1, 0xc3, 0xf7, 0xb7, 0xe6, 0x2a, 0x56, 0xbd, 0xf8, 0xa0, 0xf1, 0x60, 0xcb, 0x62,
-	0x5f, 0x03, 0x98, 0xb6, 0x5a, 0xec, 0xb5, 0x74, 0x3b, 0x1c, 0x33, 0xae, 0x67, 0x0d, 0x11, 0xcf,
-	0xea, 0x44, 0xe4, 0x1f, 0x17, 0x2c, 0x36, 0xc6, 0x6a, 0x9a, 0xea, 0xde, 0xd8, 0xcd, 0xf3, 0x34,
-	0xdb, 0xf5, 0x5b, 0xff, 0x61, 0x56, 0xa6, 0x1e, 0xf7, 0x2d, 0xf6, 0x76, 0xac, 0xc9, 0x09, 0x17,
-	0x51, 0x52, 0x13, 0xed, 0x02, 0x34, 0xa9, 0x89, 0x7e, 0xbd, 0xa7, 0x83, 0x4f, 0xfc, 0xb0, 0x01,
-	0x31, 0xf9, 0x19, 0x7d, 0x9b, 0xc9, 0xcf, 0xec, 0x57, 0x74, 0x7e, 0xdf, 0x42, 0x47, 0x99, 0x56,
-	0x51, 0xd3, 0x51, 0x52, 0xdd, 0x84, 0xe9, 0x28, 0xe9, 0xe2, 0x9b, 0xb4, 0xa4, 0x8f, 0x6f, 0x26,
-	0x89, 0xaa, 0xc2, 0xec, 0x74, 0xd6, 0x4b, 0xd6, 0xd8, 0xfa, 0xe6, 0x99, 0x73, 0x52, 0xaa, 0x6c,
-	0xdf, 0x7f, 0x47, 0x2e, 0xe8, 0x7b, 0xc7, 0x8d, 0x56, 0x30, 0xb8, 0x87, 0x3f, 0x3f, 0x13, 0x88,
-	0xee, 0x3d, 0x64, 0x73, 0x4f, 0xfd, 0xb3, 0xe4, 0x5e, 0x37, 0xa0, 0xef, 0xd1, 0xf1, 0x71, 0x59,
-	0x91, 0x3e, 0xfb, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x12, 0xf0, 0xf7, 0x96, 0x22, 0x00,
-	0x00,
+	0x10, 0xe2, 0x80, 0x90, 0x38, 0xc1, 0x95, 0x3b, 0x7f, 0x00, 0x07, 0x0e, 0x20, 0x2e, 0x7b, 0x42,
+	0x55, 0xef, 0xb5, 0xdd, 0xd5, 0xdd, 0xce, 0x26, 0x4b, 0xac, 0x1d, 0xd0, 0xde, 0xe2, 0x57, 0xaf,
+	0x5f, 0xbd, 0xf7, 0x7b, 0x9f, 0x55, 0x15, 0x28, 0x79, 0x43, 0x2e, 0x9c, 0xc0, 0xf5, 0x06, 0x7e,
+	0x75, 0x28, 0xbc, 0xc0, 0x63, 0xf9, 0x8e, 0x1b, 0x38, 0xbd, 0xb3, 0x4a, 0xd1, 0xef, 0x3a, 0x82,
+	0xb7, 0x90, 0x6a, 0xfe, 0xc6, 0x80, 0x57, 0x9e, 0xf9, 0x5c, 0xd4, 0x04, 0x77, 0x02, 0xbe, 0x2d,
+	0x9c, 0x41, 0xb3, 0x6b, 0xf1, 0x77, 0x46, 0xdc, 0x0f, 0xd8, 0x63, 0x00, 0xc1, 0x87, 0x9e, 0xef,
+	0x06, 0x9e, 0x38, 0x2b, 0x1b, 0x1b, 0xc6, 0xd6, 0xd2, 0x63, 0x56, 0x45, 0x31, 0x55, 0x6b, 0xbc,
+	0x62, 0x45, 0xb8, 0xd8, 0x2d, 0x58, 0x3a, 0x51, 0x42, 0xec, 0x81, 0xd3, 0xe7, 0xe5, 0xcc, 0x86,
+	0xb1, 0x55, 0xb4, 0x00, 0x49, 0x07, 0x4e, 0x9f, 0xb3, 0x0d, 0xc8, 0x8d, 0x7c, 0x2e, 0xca, 0x59,
+	0x25, 0xae, 0x18, 0x8a, 0x93, 0x3a, 0x58, 0x6a, 0x45, 0x8a, 0xf0, 0x03, 0x47, 0x04, 0xf6, 0xd0,
+	0x73, 0x07, 0x41, 0x39, 0x87, 0x22, 0x14, 0xe9, 0x48, 0x52, 0xcc, 0x01, 0x94, 0x93, 0x2a, 0xfb,
+	0x43, 0x6f, 0xe0, 0x73, 0xf6, 0x49, 0xc8, 0xe3, 0x66, 0xa4, 0xef, 0x4a, 0xb8, 0x01, 0xf1, 0xd1,
+	0x2a, 0xbb, 0x0f, 0x6b, 0x43, 0xc1, 0x6d, 0xc1, 0x9b, 0xdc, 0x3d, 0xe5, 0x36, 0x17, 0xc2, 0x13,
+	0x4a, 0xdb, 0x45, 0x6b, 0x75, 0x28, 0xb8, 0x85, 0xf4, 0xba, 0x24, 0x9b, 0x7f, 0x24, 0x8c, 0x9e,
+	0x0d, 0x5b, 0x2f, 0x0a, 0x46, 0xd7, 0x21, 0x3f, 0xe0, 0xdf, 0x11, 0xfc, 0x94, 0xe0, 0xa1, 0x5f,
+	0x92, 0xee, 0xf5, 0x5a, 0x92, 0x3e, 0x8f, 0x74, 0xfc, 0x65, 0xee, 0x22, 0x64, 0xba, 0x05, 0x04,
+	0x59, 0x2a, 0x14, 0x46, 0x3a, 0x14, 0x3f, 0x26, 0x28, 0x76, 0x78, 0x8f, 0xbf, 0x18, 0x50, 0x84,
+	0xa6, 0xe9, 0x1a, 0x7d, 0x08, 0xd3, 0xde, 0x35, 0xe0, 0xa5, 0x89, 0xa0, 0x86, 0xd3, 0xf9, 0x6f,
+	0xec, 0x7a, 0x15, 0x0a, 0x81, 0xd3, 0x89, 0x1a, 0xb5, 0x10, 0x38, 0x9d, 0x0b, 0x5a, 0x54, 0x83,
+	0x97, 0x63, 0x8a, 0x7c, 0x08, 0x73, 0xfe, 0x42, 0xe6, 0x60, 0x96, 0x7c, 0x84, 0xe6, 0xb0, 0xbb,
+	0xb0, 0x1a, 0x38, 0xa2, 0xc3, 0x03, 0x5b, 0xf0, 0x53, 0xd7, 0x77, 0xbd, 0x01, 0x05, 0xed, 0x0a,
+	0x92, 0x2d, 0xa2, 0xb2, 0x32, 0x2c, 0xf4, 0xb9, 0xef, 0x3b, 0x1d, 0x4e, 0xd1, 0x1b, 0xfe, 0x34,
+	0xbf, 0x8b, 0x88, 0x44, 0x6c, 0x21, 0x44, 0xd6, 0x21, 0x1b, 0x38, 0x1d, 0xb2, 0x62, 0x29, 0xdc,
+	0x5c, 0x72, 0x48, 0xba, 0x4c, 0x07, 0xfe, 0xdc, 0xf5, 0x03, 0x5f, 0x69, 0x5d, 0xb0, 0xe8, 0x57,
+	0x3a, 0x90, 0xd9, 0x74, 0x20, 0xff, 0x6a, 0xc0, 0x75, 0xb9, 0xf9, 0x3e, 0x17, 0x9d, 0x2b, 0x88,
+	0xf8, 0x10, 0xaf, 0xcc, 0x54, 0xbc, 0x6e, 0xc0, 0x62, 0xd3, 0xeb, 0xf7, 0xdd, 0xc0, 0x76, 0x5b,
+	0xa4, 0x54, 0x01, 0x09, 0x4f, 0x5b, 0xd2, 0x22, 0xaa, 0x6f, 0x94, 0xf8, 0x54, 0xcf, 0xa6, 0x62,
+	0xc7, 0x5e, 0x82, 0x79, 0x67, 0x38, 0xec, 0x9d, 0x95, 0xf3, 0x0a, 0x02, 0xfc, 0x61, 0xfe, 0x9a,
+	0x12, 0x59, 0xb3, 0x8a, 0x40, 0xd5, 0x14, 0x30, 0x62, 0x0a, 0x6c, 0xc3, 0x32, 0x65, 0xec, 0x48,
+	0x15, 0x13, 0x72, 0xfc, 0x7a, 0x68, 0xc8, 0x61, 0xd8, 0x77, 0x50, 0x28, 0x56, 0x1c, 0xab, 0x78,
+	0x12, 0xf9, 0x95, 0x0e, 0x7f, 0x2e, 0x15, 0xfe, 0x37, 0x73, 0x85, 0x4c, 0x29, 0x6b, 0xbe, 0x9b,
+	0xc1, 0x08, 0x50, 0xea, 0x36, 0x3c, 0x8b, 0xb7, 0x67, 0xeb, 0x83, 0x75, 0x00, 0xdf, 0x1b, 0x89,
+	0x26, 0xb7, 0xfd, 0xae, 0x43, 0x4e, 0x58, 0x44, 0xca, 0x71, 0xd7, 0x99, 0xea, 0x85, 0x75, 0x80,
+	0x71, 0xa8, 0xb7, 0xc9, 0x11, 0x8b, 0x61, 0x94, 0xb7, 0xa3, 0x4e, 0xca, 0xeb, 0x4e, 0xda, 0x82,
+	0x52, 0xdb, 0x15, 0x7e, 0x60, 0x0f, 0x1d, 0xc1, 0x07, 0xf8, 0xf9, 0x02, 0x26, 0x89, 0xa2, 0x1f,
+	0x29, 0xb2, 0xc5, 0xdb, 0xa6, 0x13, 0x89, 0x46, 0x02, 0xe2, 0x22, 0x6e, 0xbb, 0x4c, 0xbf, 0xfb,
+	0x1e, 0xbc, 0x9c, 0xea, 0xc5, 0xf3, 0x77, 0x78, 0x0d, 0x8a, 0x12, 0x62, 0xbb, 0xa9, 0x92, 0xb4,
+	0x45, 0x19, 0xb7, 0x24, 0x69, 0x98, 0xb7, 0x2d, 0x76, 0x07, 0x56, 0x28, 0x76, 0x42, 0xa6, 0xac,
+	0x62, 0xa2, 0x88, 0x22, 0x36, 0xf3, 0xe7, 0x06, 0x5c, 0x93, 0x36, 0xee, 0xee, 0xbe, 0xa8, 0xe9,
+	0x66, 0xfe, 0x90, 0xaa, 0xeb, 0x44, 0x45, 0x72, 0x42, 0x22, 0x3d, 0x8c, 0x2b, 0x4a, 0x8f, 0x29,
+	0xbe, 0xfa, 0x03, 0x25, 0x46, 0xad, 0xcb, 0x85, 0x38, 0x3b, 0x72, 0x9b, 0xdf, 0x9e, 0x2d, 0x5a,
+	0xf7, 0x20, 0x8f, 0xe0, 0x50, 0xde, 0xaf, 0x85, 0x3c, 0x5f, 0x76, 0x83, 0x9a, 0x5a, 0xb0, 0x88,
+	0x21, 0xde, 0xdb, 0x73, 0x89, 0xde, 0x3e, 0xbd, 0x66, 0xdd, 0x87, 0x35, 0x1c, 0x01, 0xa3, 0x02,
+	0x30, 0x65, 0x56, 0xd5, 0xc2, 0xf6, 0x44, 0xca, 0x1b, 0x50, 0x42, 0xde, 0x88, 0xb5, 0x0b, 0x53,
+	0xad, 0xc5, 0xcf, 0x27, 0x04, 0xf3, 0x9f, 0x19, 0x4c, 0xa8, 0x28, 0x80, 0x57, 0xeb, 0x4b, 0x8c,
+	0x75, 0x3b, 0x10, 0x3c, 0xe6, 0x4b, 0x5c, 0x68, 0x08, 0x8e, 0xbe, 0x94, 0x19, 0x44, 0x91, 0x18,
+	0x6d, 0x48, 0x4b, 0x48, 0x43, 0x96, 0x4b, 0x54, 0x4e, 0xd6, 0x84, 0xeb, 0x89, 0xad, 0xed, 0xa6,
+	0xd7, 0x42, 0xb4, 0x57, 0x1e, 0x57, 0xa3, 0xee, 0x4d, 0x9a, 0x5f, 0xad, 0xe9, 0xea, 0x59, 0xd7,
+	0x62, 0xfa, 0xd6, 0xbc, 0x16, 0x37, 0x5f, 0x87, 0xd5, 0x18, 0x1f, 0x2b, 0x40, 0xee, 0xe0, 0xf0,
+	0xa0, 0x5e, 0x9a, 0x63, 0x8b, 0x30, 0x5f, 0xdf, 0x3f, 0x6a, 0x7c, 0xbd, 0x64, 0xb0, 0x22, 0x14,
+	0x6a, 0x87, 0x07, 0xbb, 0x6f, 0x3d, 0xad, 0x35, 0x4a, 0x19, 0xf3, 0xf7, 0x19, 0x58, 0x53, 0x41,
+	0xc5, 0x4f, 0xb9, 0xf4, 0xc6, 0xc7, 0x11, 0x7b, 0x89, 0x88, 0xfd, 0x7b, 0x06, 0x58, 0x14, 0xbc,
+	0xff, 0x8f, 0x68, 0xb5, 0x3f, 0x20, 0x5a, 0xef, 0x6b, 0xae, 0xd5, 0x4c, 0x9f, 0x65, 0xa4, 0xfe,
+	0x3b, 0x03, 0x37, 0x54, 0x7e, 0x28, 0xb3, 0x76, 0xdd, 0x1e, 0xf7, 0x9f, 0x34, 0x25, 0x8a, 0x7b,
+	0xdc, 0x69, 0x71, 0xc1, 0x76, 0x21, 0xef, 0xa8, 0xdf, 0x0a, 0xee, 0x78, 0x52, 0xa5, 0x7f, 0x54,
+	0xc5, 0x1f, 0x8d, 0xb3, 0x21, 0xb7, 0xe8, 0x6b, 0xd9, 0x85, 0xda, 0x6e, 0x8f, 0xdb, 0x43, 0x27,
+	0xe8, 0xd2, 0x88, 0x5d, 0x90, 0x84, 0x23, 0x27, 0xe8, 0xb2, 0x4d, 0x58, 0x1e, 0xca, 0xd9, 0xd9,
+	0x1b, 0xf9, 0xc8, 0x90, 0x55, 0x0c, 0xc5, 0x90, 0xa8, 0x98, 0x64, 0x73, 0x75, 0x7c, 0xfe, 0xb9,
+	0xd7, 0xed, 0xa6, 0x37, 0x08, 0x38, 0x9d, 0x9c, 0x65, 0x73, 0x55, 0xd4, 0x1a, 0x12, 0xd9, 0x3d,
+	0x28, 0xf1, 0xe7, 0xbc, 0x39, 0x0a, 0xb8, 0x2d, 0xe5, 0xf7, 0x43, 0x84, 0x0b, 0xd6, 0x2a, 0xd1,
+	0x77, 0x89, 0x2c, 0xb7, 0x75, 0x07, 0x6d, 0x2e, 0xc6, 0x02, 0x71, 0x82, 0x2c, 0x2a, 0x22, 0xc9,
+	0x33, 0x9f, 0x01, 0x4c, 0xcc, 0x61, 0x00, 0xf9, 0x9a, 0x55, 0x7f, 0xd2, 0x90, 0x98, 0xae, 0x00,
+	0xe0, 0xdf, 0xf6, 0xce, 0x53, 0xab, 0x64, 0xc8, 0xb5, 0x67, 0x47, 0x3b, 0x72, 0x2d, 0x23, 0x91,
+	0xdf, 0x3f, 0xfc, 0x6a, 0xbd, 0x94, 0x95, 0xd4, 0x9d, 0xfa, 0x5b, 0xf5, 0x46, 0xbd, 0x94, 0x93,
+	0x5e, 0xa8, 0xed, 0xed, 0x1f, 0xee, 0x94, 0xe6, 0xcd, 0x9f, 0x18, 0xd4, 0xd7, 0xe2, 0x10, 0xb2,
+	0x37, 0x20, 0xdf, 0x55, 0x30, 0x52, 0x80, 0x6f, 0x5e, 0x00, 0xf1, 0xbd, 0x39, 0x8b, 0x3e, 0x62,
+	0x15, 0x58, 0x08, 0xcd, 0x51, 0x30, 0xef, 0xcd, 0x59, 0x21, 0x61, 0xdb, 0x84, 0x0d, 0x59, 0x32,
+	0x6c, 0x8a, 0x6b, 0x89, 0x8f, 0x6f, 0xa3, 0x83, 0xec, 0xa1, 0x73, 0xd6, 0xf3, 0x9c, 0x96, 0xf9,
+	0xbb, 0x2c, 0xdc, 0x8c, 0xed, 0x44, 0xf5, 0x8b, 0x22, 0x62, 0x36, 0x55, 0x2c, 0x56, 0x9a, 0xb2,
+	0x89, 0xd2, 0x74, 0x07, 0x56, 0x48, 0xed, 0xb0, 0x42, 0x61, 0xf9, 0x5a, 0x46, 0xea, 0x3e, 0xd5,
+	0xa9, 0x4f, 0x03, 0x23, 0x36, 0x67, 0x14, 0x74, 0x3d, 0x81, 0xe2, 0xb0, 0x98, 0x95, 0x70, 0xe5,
+	0x89, 0x5a, 0x50, 0x42, 0xab, 0x70, 0x4d, 0xe7, 0xe6, 0x7d, 0xc7, 0xed, 0x51, 0x5d, 0x5b, 0x8b,
+	0xb2, 0xd7, 0xe5, 0x42, 0x7a, 0x15, 0x5c, 0xb8, 0x78, 0x15, 0x2c, 0x5c, 0xb8, 0x0a, 0xca, 0x63,
+	0x4d, 0xdb, 0x13, 0x4d, 0x5e, 0x5e, 0xc4, 0x63, 0x8d, 0xfa, 0x21, 0xd3, 0x08, 0x85, 0xca, 0xb1,
+	0x1d, 0x70, 0x98, 0x53, 0x84, 0xe3, 0xae, 0x63, 0xfe, 0x96, 0x4e, 0x72, 0x49, 0xd7, 0xb1, 0x2f,
+	0xc6, 0x82, 0xea, 0xf6, 0x94, 0xa0, 0xd2, 0x5c, 0x1d, 0x89, 0xaa, 0xcf, 0x8f, 0xcb, 0x40, 0x46,
+	0xaf, 0xba, 0xe9, 0x41, 0x39, 0x17, 0xe6, 0xfd, 0xf6, 0x26, 0xbc, 0x96, 0x0c, 0x39, 0x81, 0xbb,
+	0x8c, 0x63, 0xee, 0x57, 0xe1, 0x25, 0x5d, 0x54, 0x91, 0x2b, 0x2c, 0xfb, 0xb7, 0x60, 0xc9, 0x1d,
+	0xb4, 0xf8, 0x73, 0xad, 0xe0, 0x83, 0x22, 0x9d, 0x53, 0xc8, 0xa7, 0x9c, 0x97, 0x7f, 0x39, 0xee,
+	0xed, 0xb2, 0xf0, 0xcc, 0x7c, 0x76, 0x17, 0x6a, 0x9b, 0xc8, 0xec, 0x8e, 0x84, 0x73, 0x8e, 0xca,
+	0xeb, 0x40, 0x79, 0xa3, 0x82, 0x64, 0x1e, 0xcf, 0x76, 0x48, 0x91, 0x67, 0xbb, 0x2f, 0xc1, 0x9a,
+	0xe0, 0x7d, 0x2f, 0xe0, 0xd1, 0xc0, 0xcc, 0x4f, 0x55, 0xb8, 0x84, 0xcc, 0x91, 0xc8, 0xdc, 0x84,
+	0x65, 0x12, 0x40, 0xdb, 0x63, 0x02, 0x14, 0x91, 0x88, 0x6e, 0xf8, 0x42, 0xa6, 0x6c, 0x98, 0xdf,
+	0x37, 0xc2, 0x46, 0x8e, 0x48, 0x8d, 0xef, 0x34, 0x80, 0x8c, 0x92, 0xfa, 0xe1, 0x31, 0x8b, 0xcc,
+	0x94, 0xfa, 0x5d, 0xe2, 0x74, 0x20, 0xf1, 0xe9, 0xc4, 0x1a, 0x74, 0xa1, 0x43, 0xdd, 0x59, 0xa9,
+	0xf0, 0x27, 0xaa, 0x66, 0xa8, 0x42, 0xcd, 0x1b, 0xb4, 0x5d, 0xd1, 0x77, 0x4e, 0x7a, 0x63, 0xbf,
+	0xd5, 0x63, 0x89, 0xf1, 0x29, 0xbd, 0x0d, 0xa7, 0x7f, 0x55, 0x4d, 0xe4, 0xc7, 0xf5, 0xf0, 0x12,
+	0x42, 0x9d, 0x0a, 0xf7, 0xe6, 0xe8, 0x1a, 0xa2, 0xf2, 0xd3, 0x0c, 0xe4, 0x67, 0x5a, 0x37, 0xff,
+	0x67, 0x23, 0x64, 0xfb, 0x1e, 0xdc, 0x55, 0x95, 0x81, 0xd4, 0x6f, 0x4e, 0x50, 0x4e, 0xd4, 0x87,
+	0xbf, 0x19, 0xb0, 0x3e, 0xc5, 0x1f, 0x14, 0x53, 0xb7, 0x92, 0x31, 0xb5, 0x37, 0x17, 0x8d, 0xaa,
+	0xbb, 0xb0, 0x42, 0x0c, 0xd2, 0x31, 0x6e, 0x78, 0x7e, 0xdf, 0x9b, 0xb3, 0x96, 0x91, 0xfe, 0x04,
+	0xc9, 0x97, 0x29, 0x05, 0x7a, 0xf8, 0xe5, 0xf4, 0xf0, 0xdb, 0xbe, 0x0f, 0x5b, 0xd3, 0xed, 0x43,
+	0xb5, 0xc7, 0x06, 0xfe, 0x82, 0x6a, 0xca, 0xf1, 0x3b, 0x23, 0xc7, 0x9f, 0xfd, 0x7d, 0x80, 0xaf,
+	0xb6, 0x89, 0x44, 0x0c, 0x12, 0xce, 0x89, 0x18, 0xad, 0xef, 0xcc, 0xeb, 0x7d, 0x87, 0xbd, 0x02,
+	0x0b, 0x7c, 0xd0, 0x52, 0x4b, 0x79, 0xb5, 0x94, 0xe7, 0x83, 0x96, 0x5c, 0xb8, 0x0d, 0x79, 0xec,
+	0xab, 0x34, 0xfe, 0xeb, 0xea, 0xd0, 0x5a, 0x4a, 0x67, 0x2f, 0xa4, 0x74, 0x76, 0xd3, 0xc5, 0x62,
+	0x12, 0x42, 0x34, 0x29, 0x26, 0x64, 0x4d, 0xa4, 0x98, 0x20, 0x45, 0x6a, 0x70, 0x5e, 0x81, 0xc0,
+	0xab, 0x37, 0x2b, 0xe9, 0x6e, 0xf3, 0x67, 0x74, 0xe9, 0x20, 0x63, 0xe2, 0xec, 0xc8, 0x09, 0x26,
+	0x57, 0x34, 0xe7, 0xf6, 0xd1, 0x04, 0x7b, 0x35, 0x6d, 0x3a, 0x1b, 0x4a, 0x06, 0xee, 0x4f, 0xa6,
+	0x33, 0x22, 0x54, 0x7e, 0x60, 0xcc, 0xb8, 0x56, 0x6c, 0xc2, 0x32, 0xdd, 0xde, 0x91, 0x8f, 0x69,
+	0xcc, 0x46, 0x22, 0xa5, 0x65, 0x38, 0x23, 0xaa, 0xfa, 0x65, 0x2b, 0xdd, 0x12, 0xf9, 0xf8, 0x0d,
+	0x9c, 0x33, 0xa2, 0xf6, 0x5e, 0x5d, 0xb7, 0x36, 0xff, 0x61, 0x40, 0x65, 0xf2, 0x98, 0x73, 0x3c,
+	0x3a, 0xe9, 0x7b, 0xad, 0x51, 0x8f, 0xcf, 0xfc, 0x42, 0x94, 0x82, 0x30, 0x72, 0x21, 0x8a, 0x94,
+	0xf3, 0x2e, 0x44, 0x6f, 0xc2, 0xa2, 0x1f, 0x2a, 0x18, 0xde, 0x87, 0x8e, 0x09, 0x29, 0x91, 0x9d,
+	0x4f, 0x8b, 0xec, 0x3f, 0x1b, 0x78, 0x06, 0x4b, 0x18, 0xfc, 0xd1, 0xdc, 0xb9, 0x25, 0x4e, 0xbe,
+	0xb9, 0xc4, 0xc9, 0xf7, 0xcd, 0x5c, 0x21, 0x5b, 0xca, 0x59, 0xc9, 0xc3, 0xf4, 0xe3, 0x7f, 0x2d,
+	0x41, 0x69, 0xac, 0xcf, 0x31, 0x17, 0xa7, 0x6e, 0x93, 0xb3, 0x6f, 0x41, 0x29, 0xfe, 0xa0, 0xc9,
+	0x6e, 0x69, 0x13, 0x64, 0xf2, 0x75, 0xb6, 0xb2, 0x31, 0x9d, 0x01, 0x71, 0x31, 0x17, 0xdf, 0x7f,
+	0x6f, 0x6b, 0xbe, 0x60, 0x54, 0x8c, 0x47, 0xe1, 0x0e, 0xd1, 0xf7, 0x3f, 0x7d, 0x87, 0x94, 0xb7,
+	0x4d, 0x7d, 0x87, 0xb4, 0xa7, 0xc3, 0x94, 0x1d, 0xa2, 0xcf, 0x70, 0xfa, 0x0e, 0x29, 0x4f, 0x86,
+	0xfa, 0x0e, 0x69, 0x2f, 0x78, 0xd1, 0x1d, 0xbe, 0x06, 0xcb, 0xda, 0x23, 0x10, 0xbb, 0x99, 0x44,
+	0x60, 0xf2, 0xce, 0x55, 0x59, 0x9f, 0xb2, 0x3a, 0x55, 0xf0, 0xf8, 0xbd, 0x4d, 0x17, 0x1c, 0x7f,
+	0x0f, 0xd4, 0x05, 0x27, 0x1e, 0xe9, 0xa2, 0x82, 0xdf, 0x86, 0x15, 0xfd, 0xae, 0x9e, 0x69, 0xdf,
+	0x26, 0x1e, 0x33, 0x2a, 0x9f, 0x98, 0xb6, 0x9c, 0x94, 0xed, 0xc0, 0x6a, 0xec, 0xfd, 0x86, 0x25,
+	0xbf, 0xd6, 0xd1, 0xbe, 0x35, 0x75, 0x3d, 0x21, 0x7e, 0xcb, 0x78, 0x68, 0xb0, 0x06, 0x14, 0xa3,
+	0x77, 0xdc, 0xec, 0x46, 0xf4, 0xfb, 0xd8, 0xe5, 0x7c, 0xe5, 0x66, 0xfa, 0xe2, 0x54, 0x50, 0x26,
+	0x17, 0x8e, 0x3a, 0x28, 0x89, 0x8b, 0x6c, 0x1d, 0x94, 0xe4, 0x3d, 0x65, 0x0a, 0x28, 0x91, 0x73,
+	0x92, 0x0e, 0x4a, 0xf2, 0x24, 0xa7, 0x83, 0x92, 0x72, 0xc0, 0x32, 0x97, 0xde, 0x7f, 0x6f, 0x6b,
+	0xa1, 0x60, 0x54, 0xb2, 0x8f, 0xaa, 0x8f, 0xb6, 0x0c, 0xf6, 0x15, 0x80, 0xc9, 0xa8, 0xc5, 0x5e,
+	0x4d, 0x8e, 0xc3, 0xa1, 0xe0, 0x4a, 0xda, 0x12, 0xc9, 0x2c, 0x8e, 0x55, 0xfe, 0x51, 0xc6, 0x60,
+	0x23, 0xec, 0xa6, 0x89, 0xe9, 0x8d, 0xdd, 0xbe, 0xc8, 0xb0, 0x5d, 0xb9, 0xf3, 0x01, 0x5c, 0xa9,
+	0x76, 0x3c, 0x34, 0xd8, 0x41, 0x68, 0xc9, 0x29, 0x17, 0x41, 0xdc, 0x92, 0xc8, 0xbd, 0x6c, 0xdc,
+	0x92, 0xe8, 0xd5, 0x5b, 0x14, 0x7c, 0x92, 0x87, 0x03, 0x88, 0x2e, 0x4f, 0x9b, 0xdb, 0x74, 0x79,
+	0xfa, 0xbc, 0x12, 0x95, 0xf7, 0x4d, 0x0c, 0x94, 0x49, 0x17, 0xd5, 0x03, 0x25, 0x31, 0x4d, 0xe8,
+	0x81, 0x92, 0x6c, 0xbe, 0x71, 0x4f, 0xba, 0xf8, 0xca, 0x14, 0xeb, 0x2a, 0xcc, 0x4c, 0x56, 0xbd,
+	0x78, 0x8f, 0xad, 0x6c, 0x9e, 0xcb, 0x93, 0x30, 0x65, 0xfb, 0xe1, 0xdb, 0xf2, 0x83, 0x9e, 0x73,
+	0x52, 0x6d, 0x7a, 0xfd, 0x07, 0xf8, 0xe7, 0x67, 0x3c, 0xd1, 0x79, 0x80, 0x62, 0x1e, 0xa8, 0xff,
+	0xc5, 0x79, 0xd0, 0xf1, 0xe8, 0xf7, 0xf0, 0xe4, 0x24, 0xaf, 0x48, 0x9f, 0xfd, 0x4f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x81, 0xd4, 0x1b, 0xc8, 0xc8, 0x23, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/operations.proto b/proto/operations.proto
index 681b0b075..7504efe4b 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -243,10 +243,17 @@ message UserCherryPickRequest {
 }
 
 message UserCherryPickResponse {
+  enum CreateTreeError {
+    NONE = 0;
+    EMPTY = 1;
+    CONFLICT = 2;
+  }
+
   OperationBranchUpdate branch_update = 1;
   string create_tree_error = 2;
   string commit_error = 3;
   string pre_receive_error = 4;
+  CreateTreeError create_tree_error_code = 5;
 }
 
 message UserRevertRequest {
@@ -260,10 +267,17 @@ message UserRevertRequest {
 }
 
 message UserRevertResponse {
+  enum CreateTreeError {
+    NONE = 0;
+    EMPTY = 1;
+    CONFLICT = 2;
+  }
+
   OperationBranchUpdate branch_update = 1;
   string create_tree_error = 2;
   string commit_error = 3;
   string pre_receive_error = 4;
+  CreateTreeError create_tree_error_code = 5;
 }
 
 message UserCommitFilesActionHeader {
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index f9538e5e2..3079dda49 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -169,7 +169,10 @@ module GitalyServer
       branch_update = branch_update_result(result)
       Gitaly::UserCherryPickResponse.new(branch_update: branch_update)
     rescue Gitlab::Git::Repository::CreateTreeError => e
-      Gitaly::UserCherryPickResponse.new(create_tree_error: set_utf8!(e.message))
+      Gitaly::UserCherryPickResponse.new(
+        create_tree_error: set_utf8!(e.message),
+        create_tree_error_code: e.error.upcase
+      )
     rescue Gitlab::Git::CommitError => e
       Gitaly::UserCherryPickResponse.new(commit_error: set_utf8!(e.message))
     rescue Gitlab::Git::PreReceiveError => e
@@ -194,7 +197,10 @@ module GitalyServer
       branch_update = branch_update_result(result)
       Gitaly::UserRevertResponse.new(branch_update: branch_update)
     rescue Gitlab::Git::Repository::CreateTreeError => e
-      Gitaly::UserRevertResponse.new(create_tree_error: set_utf8!(e.message))
+      Gitaly::UserRevertResponse.new(
+        create_tree_error: set_utf8!(e.message),
+        create_tree_error_code: e.error.upcase
+      )
     rescue Gitlab::Git::CommitError => e
       Gitaly::UserRevertResponse.new(commit_error: set_utf8!(e.message))
     rescue Gitlab::Git::PreReceiveError => e
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index e95769be9..a8c1efe5d 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -32,9 +32,16 @@ module Gitlab
       InvalidRef = Class.new(StandardError)
       GitError = Class.new(StandardError)
       DeleteBranchError = Class.new(StandardError)
-      CreateTreeError = Class.new(StandardError)
       TagExistsError = Class.new(StandardError)
 
+      class CreateTreeError < StandardError
+        attr_reader :error
+
+        def initialize(error)
+          @error = error
+        end
+      end
+
       class << self
         def from_gitaly(gitaly_repository, call)
           new(
@@ -320,7 +327,6 @@ module Gitlab
         ) do |start_commit|
 
           revert_tree_id = check_revert_content(commit, start_commit.sha)
-          raise CreateTreeError unless revert_tree_id
 
           committer = user_to_committer(user)
 
@@ -777,10 +783,10 @@ module Gitlab
         args << { mainline: 1 } if target_commit.merge_commit?
 
         revert_index = rugged.revert_commit(*args)
-        return false if revert_index.conflicts?
+        raise CreateTreeError, :conflict if revert_index.conflicts?
 
         tree_id = revert_index.write_tree(rugged)
-        return false unless diff_exists?(source_sha, tree_id)
+        raise CreateTreeError, :empty unless diff_exists?(source_sha, tree_id)
 
         tree_id
       end
@@ -818,7 +824,6 @@ module Gitlab
         ) do |start_commit|
 
           cherry_pick_tree_id = check_cherry_pick_content(commit, start_commit.sha)
-          raise CreateTreeError unless cherry_pick_tree_id
 
           committer = user_to_committer(user)
 
@@ -839,10 +844,10 @@ module Gitlab
         args << 1 if target_commit.merge_commit?
 
         cherry_pick_index = rugged.cherrypick_commit(*args)
-        return false if cherry_pick_index.conflicts?
+        raise CreateTreeError, :conflict if cherry_pick_index.conflicts?
 
         tree_id = cherry_pick_index.write_tree(rugged)
-        return false unless diff_exists?(source_sha, tree_id)
+        raise CreateTreeError, :empty unless diff_exists?(source_sha, tree_id)
 
         tree_id
       end
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index 2c265f8ee..7383511f5 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -108,6 +108,12 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :create_tree_error, :string, 2
     optional :commit_error, :string, 3
     optional :pre_receive_error, :string, 4
+    optional :create_tree_error_code, :enum, 5, "gitaly.UserCherryPickResponse.CreateTreeError"
+  end
+  add_enum "gitaly.UserCherryPickResponse.CreateTreeError" do
+    value :NONE, 0
+    value :EMPTY, 1
+    value :CONFLICT, 2
   end
   add_message "gitaly.UserRevertRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
@@ -123,6 +129,12 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :create_tree_error, :string, 2
     optional :commit_error, :string, 3
     optional :pre_receive_error, :string, 4
+    optional :create_tree_error_code, :enum, 5, "gitaly.UserRevertResponse.CreateTreeError"
+  end
+  add_enum "gitaly.UserRevertResponse.CreateTreeError" do
+    value :NONE, 0
+    value :EMPTY, 1
+    value :CONFLICT, 2
   end
   add_message "gitaly.UserCommitFilesActionHeader" do
     optional :action, :enum, 1, "gitaly.UserCommitFilesActionHeader.ActionType"
@@ -269,8 +281,10 @@ module Gitaly
   UserFFBranchResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserFFBranchResponse").msgclass
   UserCherryPickRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickRequest").msgclass
   UserCherryPickResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickResponse").msgclass
+  UserCherryPickResponse::CreateTreeError = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickResponse.CreateTreeError").enummodule
   UserRevertRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRevertRequest").msgclass
   UserRevertResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRevertResponse").msgclass
+  UserRevertResponse::CreateTreeError = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRevertResponse.CreateTreeError").enummodule
   UserCommitFilesActionHeader = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCommitFilesActionHeader").msgclass
   UserCommitFilesActionHeader::ActionType = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCommitFilesActionHeader.ActionType").enummodule
   UserCommitFilesAction = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCommitFilesAction").msgclass