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:
authorPavlo Strokov <pstrokov@gitlab.com>2020-03-10 18:49:05 +0300
committerPaul Okstad <pokstad@gitlab.com>2020-03-10 18:49:05 +0300
commit16f12f480dfa2004cb62033a5f221433dfee4d6c (patch)
tree3349959c72dc02df15fed804cb4989373cc5249f /proto/go/gitalypb/conflicts.pb.go
parent5e6af2c1bd61b21fa44581ac2d11911bc86f16d1 (diff)
Task proto has dependency to already generated source code.
Extracting lint-related stuff into separate proto file. It is required in order to have proper working proto-linter. Previously it was using compiled files for verification and it fails in some cases (https://gitlab.com/gitlab-org/gitaly/-/jobs/459024976). lint.proto extracted from shared.proto and contains lint-related declarations. New task `proto-lint` added to compile source code that is required by `protoc-gen-gitaly`. `protoc-gen-gitaly` fixed to use proper proto source data. Regeneration of all proto-related files.
Diffstat (limited to 'proto/go/gitalypb/conflicts.pb.go')
-rw-r--r--proto/go/gitalypb/conflicts.pb.go81
1 files changed, 41 insertions, 40 deletions
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go
index 78c8495a2..de7f27715 100644
--- a/proto/go/gitalypb/conflicts.pb.go
+++ b/proto/go/gitalypb/conflicts.pb.go
@@ -488,46 +488,47 @@ func init() {
func init() { proto.RegisterFile("conflicts.proto", fileDescriptor_28fc8937e7d75862) }
var fileDescriptor_28fc8937e7d75862 = []byte{
- // 624 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xc1, 0x6e, 0xd3, 0x40,
- 0x10, 0x86, 0xbb, 0x69, 0x9a, 0x26, 0x53, 0xb7, 0x4d, 0x57, 0xa0, 0xba, 0x91, 0xaa, 0xba, 0x2e,
- 0x95, 0x0c, 0x82, 0xa4, 0x2a, 0x1c, 0xb8, 0x55, 0x4a, 0x55, 0xa8, 0x2a, 0x2a, 0xd0, 0x22, 0x2e,
- 0x5c, 0x2c, 0xc7, 0xde, 0x26, 0x46, 0x8e, 0x27, 0xec, 0xae, 0x2b, 0xe5, 0x25, 0xb8, 0xc2, 0x91,
- 0x03, 0xcf, 0xc2, 0x2b, 0xf0, 0x2e, 0x48, 0x48, 0x28, 0xbb, 0xb6, 0x9b, 0x36, 0x49, 0x39, 0x71,
- 0x4b, 0xfe, 0xf9, 0x34, 0xf3, 0x7b, 0xe6, 0xd7, 0xc2, 0x66, 0x88, 0xe9, 0x55, 0x12, 0x87, 0x4a,
- 0xb6, 0x47, 0x02, 0x15, 0xd2, 0x5a, 0x3f, 0x56, 0x41, 0x32, 0x6e, 0x59, 0x72, 0x10, 0x08, 0x1e,
- 0x19, 0xd5, 0xfd, 0x41, 0xc0, 0x7e, 0x13, 0x4b, 0x75, 0x9a, 0xd3, 0xaf, 0xe2, 0x84, 0x4b, 0xc6,
- 0x3f, 0x67, 0x5c, 0x2a, 0xfa, 0x12, 0x40, 0xf0, 0x11, 0xca, 0x58, 0xa1, 0x18, 0xdb, 0xc4, 0x21,
- 0xde, 0xda, 0x31, 0x6d, 0x9b, 0x3e, 0x6d, 0x56, 0x56, 0xba, 0xd5, 0x6f, 0x3f, 0x9f, 0x12, 0x36,
- 0xc5, 0xd2, 0x47, 0xb0, 0x81, 0x99, 0xf0, 0x43, 0x1c, 0x0e, 0x63, 0xe5, 0x63, 0x1c, 0xd9, 0x15,
- 0x87, 0x78, 0x0d, 0x66, 0x61, 0x26, 0x4e, 0xb5, 0xf8, 0x36, 0x8e, 0xa8, 0x07, 0x4d, 0x35, 0xe0,
- 0xf1, 0x2d, 0x6e, 0x59, 0x73, 0x1b, 0x5a, 0x2f, 0x49, 0xf7, 0x0b, 0x01, 0x3a, 0x6d, 0xf1, 0x9c,
- 0x07, 0x11, 0x17, 0x74, 0x17, 0x60, 0x66, 0x44, 0x23, 0x2c, 0xfb, 0xef, 0x02, 0x98, 0xfe, 0xa3,
- 0x40, 0x0d, 0x74, 0x67, 0x8b, 0x35, 0xb4, 0xf2, 0x2e, 0x50, 0x03, 0xba, 0x03, 0xf5, 0x89, 0x49,
- 0x5d, 0xac, 0xea, 0xe2, 0x2a, 0x66, 0xb7, 0x4a, 0x43, 0x8c, 0xb8, 0xbd, 0xe2, 0x10, 0x6f, 0x45,
- 0x97, 0x2e, 0x31, 0xe2, 0x17, 0xd5, 0x3a, 0x69, 0x56, 0xdc, 0x31, 0x58, 0xd3, 0x7e, 0xe8, 0x0b,
- 0xa8, 0x0d, 0xb4, 0xa7, 0x7c, 0x4d, 0xad, 0x62, 0x4d, 0xb3, 0xae, 0xcf, 0x97, 0x58, 0xce, 0xd2,
- 0x16, 0xac, 0x86, 0x98, 0x2a, 0x9e, 0x2a, 0x6d, 0xde, 0x3a, 0x5f, 0x62, 0x85, 0xd0, 0xdd, 0x86,
- 0x87, 0xc5, 0x09, 0xfd, 0xab, 0x38, 0xe1, 0xfe, 0x28, 0x18, 0x27, 0x18, 0x44, 0xee, 0x6b, 0xd8,
- 0x99, 0x73, 0x31, 0x39, 0xc2, 0x54, 0x72, 0xfa, 0x04, 0x56, 0x26, 0xb0, 0xb4, 0x89, 0xb3, 0xec,
- 0xad, 0x1d, 0x3f, 0x98, 0x67, 0x83, 0x19, 0xc4, 0xfd, 0x53, 0x81, 0x5d, 0xc6, 0x25, 0x26, 0xd7,
- 0xbc, 0x28, 0x17, 0xa7, 0xcf, 0xf7, 0xfb, 0xbf, 0x03, 0x70, 0x02, 0x5b, 0x2a, 0x10, 0x7d, 0xae,
- 0xfc, 0xa9, 0x31, 0xcb, 0x8b, 0xc6, 0xb0, 0xa6, 0x81, 0x6f, 0x94, 0xb9, 0x09, 0xaa, 0xce, 0x4b,
- 0x10, 0x3d, 0x80, 0x75, 0x89, 0x99, 0x08, 0xb9, 0xdf, 0x13, 0x41, 0x1a, 0x0e, 0xf4, 0x59, 0x2d,
- 0x66, 0x19, 0xb1, 0xab, 0xb5, 0x09, 0x94, 0xfb, 0xc9, 0xa1, 0x9a, 0x81, 0x8c, 0x98, 0x43, 0x87,
- 0xb0, 0x91, 0x4f, 0x1b, 0x72, 0x29, 0x83, 0x3e, 0xb7, 0x57, 0x35, 0xb5, 0x6e, 0xd4, 0x4b, 0x23,
- 0x52, 0x07, 0xaa, 0x99, 0xe4, 0xc2, 0xae, 0xeb, 0xcf, 0xb1, 0x8a, 0xcf, 0xf9, 0x20, 0xb9, 0x60,
- 0xba, 0xe2, 0x7e, 0x27, 0xb0, 0xbd, 0x60, 0xff, 0xf4, 0xe4, 0x4e, 0x9e, 0x0e, 0x6f, 0xd6, 0x71,
- 0xcf, 0xc1, 0xa6, 0xa2, 0xb5, 0x07, 0xa0, 0xaf, 0xec, 0x7f, 0x92, 0x98, 0x96, 0xe9, 0x6a, 0x68,
- 0xed, 0x42, 0x62, 0xda, 0x3d, 0x80, 0x7d, 0x61, 0x7a, 0xf9, 0xe5, 0x53, 0xe1, 0x0b, 0xd3, 0xad,
- 0xcc, 0xda, 0x19, 0xd8, 0xb3, 0x03, 0xf3, 0xa8, 0x3d, 0x86, 0xa6, 0x6e, 0x90, 0xa9, 0x18, 0x53,
- 0x9f, 0x0b, 0x81, 0xc6, 0x6c, 0x83, 0x6d, 0xde, 0xe8, 0x67, 0x13, 0xf9, 0xf8, 0x17, 0x81, 0x66,
- 0xd9, 0xe0, 0x3d, 0x17, 0xd7, 0x71, 0xc8, 0x69, 0x0f, 0xb6, 0x66, 0x72, 0x4c, 0x9d, 0xe2, 0x3b,
- 0x17, 0x3d, 0x4a, 0xad, 0xfd, 0x7b, 0x08, 0xe3, 0xcc, 0xad, 0xfd, 0xfe, 0xea, 0x55, 0xea, 0x95,
- 0x23, 0x42, 0x7d, 0x68, 0xde, 0xf5, 0x4f, 0xf7, 0xfe, 0xb1, 0xca, 0x96, 0xb3, 0x18, 0xb8, 0x35,
- 0x80, 0x78, 0xa4, 0x7b, 0xf4, 0x71, 0x02, 0x27, 0x41, 0xaf, 0x1d, 0xe2, 0xb0, 0x63, 0x7e, 0x3e,
- 0x43, 0xd1, 0xef, 0x98, 0x16, 0x1d, 0xfd, 0xca, 0x76, 0xfa, 0x98, 0xff, 0x1f, 0xf5, 0x7a, 0x35,
- 0x2d, 0x3d, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x02, 0x6b, 0xd6, 0x00, 0xa1, 0x05, 0x00, 0x00,
+ // 630 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x41, 0x6f, 0xd3, 0x30,
+ 0x14, 0x9e, 0xbb, 0xae, 0x6b, 0xdf, 0xb2, 0xad, 0xb3, 0x40, 0xcb, 0x2a, 0x4d, 0xcb, 0x32, 0x26,
+ 0x05, 0x04, 0xed, 0x34, 0x38, 0x70, 0x9b, 0xd4, 0x69, 0x30, 0x4d, 0x4c, 0x20, 0x23, 0x2e, 0x5c,
+ 0xa2, 0x34, 0xf1, 0x1a, 0xa3, 0x34, 0x0e, 0xb6, 0x33, 0xa9, 0x7f, 0x82, 0x2b, 0x1c, 0x39, 0xf0,
+ 0x5b, 0xf8, 0x0b, 0xfc, 0x17, 0x24, 0x24, 0x54, 0x3b, 0xc9, 0xba, 0xb5, 0x1d, 0x27, 0x6e, 0xf1,
+ 0xf7, 0xbe, 0x7c, 0xef, 0xf3, 0x7b, 0x9f, 0x0c, 0x9b, 0x21, 0x4f, 0xaf, 0x12, 0x16, 0x2a, 0xd9,
+ 0xcd, 0x04, 0x57, 0x1c, 0x37, 0x86, 0x4c, 0x05, 0xc9, 0xb8, 0x03, 0x09, 0x4b, 0x95, 0xc1, 0x3a,
+ 0x96, 0x8c, 0x03, 0x41, 0x23, 0x73, 0x72, 0x7f, 0x20, 0xb0, 0xdf, 0x30, 0xa9, 0x4e, 0x8b, 0x3f,
+ 0x5f, 0xb1, 0x84, 0x4a, 0x42, 0x3f, 0xe7, 0x54, 0x2a, 0xfc, 0x12, 0x40, 0xd0, 0x8c, 0x4b, 0xa6,
+ 0xb8, 0x18, 0xdb, 0xc8, 0x41, 0xde, 0xda, 0x31, 0xee, 0x1a, 0xcd, 0x2e, 0xa9, 0x2a, 0xfd, 0xfa,
+ 0xb7, 0x9f, 0x4f, 0x11, 0x99, 0xe2, 0xe2, 0x47, 0xb0, 0xc1, 0x73, 0xe1, 0x87, 0x7c, 0x34, 0x62,
+ 0xca, 0xe7, 0x2c, 0xb2, 0x6b, 0x0e, 0xf2, 0x5a, 0xc4, 0xe2, 0xb9, 0x38, 0xd5, 0xe0, 0x5b, 0x16,
+ 0x61, 0x0f, 0xda, 0x2a, 0xa6, 0xec, 0x16, 0x6f, 0x59, 0xf3, 0x36, 0x34, 0x5e, 0x31, 0xdd, 0x2f,
+ 0x08, 0xf0, 0xb4, 0xc5, 0x73, 0x1a, 0x44, 0x54, 0xe0, 0x5d, 0x80, 0x99, 0x16, 0xad, 0xb0, 0xd2,
+ 0xdf, 0x05, 0x30, 0xfa, 0x59, 0xa0, 0x62, 0xad, 0x6c, 0x91, 0x96, 0x46, 0xde, 0x05, 0x2a, 0xc6,
+ 0x3b, 0xd0, 0x9c, 0x98, 0xd4, 0xc5, 0xba, 0x2e, 0xae, 0xf2, 0xfc, 0x56, 0x69, 0xc4, 0x23, 0x6a,
+ 0xaf, 0x38, 0xc8, 0x5b, 0xd1, 0xa5, 0x4b, 0x1e, 0xd1, 0x8b, 0x7a, 0x13, 0xb5, 0x6b, 0xee, 0x18,
+ 0xac, 0x69, 0x3f, 0xf8, 0x05, 0x34, 0x62, 0xed, 0xa9, 0x18, 0x53, 0xa7, 0x1c, 0xd3, 0xac, 0xeb,
+ 0xf3, 0x25, 0x52, 0x70, 0x71, 0x07, 0x56, 0x43, 0x9e, 0x2a, 0x9a, 0x2a, 0x6d, 0xde, 0x3a, 0x5f,
+ 0x22, 0x25, 0xd0, 0xdf, 0x86, 0x87, 0xe5, 0x3a, 0xfd, 0x2b, 0x96, 0x50, 0x3f, 0x0b, 0xc6, 0x09,
+ 0x0f, 0x22, 0xf7, 0x35, 0xec, 0xcc, 0xd9, 0x98, 0xcc, 0x78, 0x2a, 0x29, 0x7e, 0x02, 0x2b, 0x13,
+ 0xb2, 0xb4, 0x91, 0xb3, 0xec, 0xad, 0x1d, 0x3f, 0x98, 0x67, 0x83, 0x18, 0x8a, 0xfb, 0xa7, 0x06,
+ 0xbb, 0x84, 0x4a, 0x9e, 0x5c, 0xd3, 0xb2, 0x5c, 0xae, 0xbe, 0x98, 0xef, 0xff, 0x0e, 0xc0, 0x09,
+ 0x6c, 0xa9, 0x40, 0x0c, 0xa9, 0xf2, 0xa7, 0xda, 0x2c, 0x2f, 0x6a, 0x43, 0xda, 0x86, 0x7c, 0x83,
+ 0xcc, 0x4d, 0x50, 0x7d, 0x5e, 0x82, 0xf0, 0x01, 0xac, 0x4b, 0x9e, 0x8b, 0x90, 0xfa, 0x03, 0x11,
+ 0xa4, 0x61, 0xac, 0xd7, 0x6a, 0x11, 0xcb, 0x80, 0x7d, 0x8d, 0x4d, 0x48, 0x85, 0x9f, 0x82, 0xd4,
+ 0x30, 0x24, 0x03, 0x16, 0xa4, 0x43, 0xd8, 0x28, 0xba, 0x8d, 0xa8, 0x94, 0xc1, 0x90, 0xda, 0xab,
+ 0x9a, 0xb5, 0x6e, 0xd0, 0x4b, 0x03, 0x62, 0x07, 0xea, 0xb9, 0xa4, 0xc2, 0x6e, 0xea, 0xeb, 0x58,
+ 0xe5, 0x75, 0x3e, 0x48, 0x2a, 0x88, 0xae, 0xb8, 0xdf, 0x11, 0x6c, 0x2f, 0x98, 0x3f, 0x3e, 0xb9,
+ 0x93, 0xa7, 0xc3, 0x9b, 0x71, 0xdc, 0xb3, 0xb0, 0xa9, 0x68, 0xed, 0x01, 0xe8, 0x2d, 0xfb, 0x9f,
+ 0x24, 0x4f, 0xab, 0x74, 0xb5, 0x34, 0x76, 0x21, 0x79, 0xda, 0x3f, 0x80, 0x7d, 0x61, 0xb4, 0xfc,
+ 0xea, 0xd9, 0xf0, 0x85, 0x51, 0xab, 0xb2, 0x76, 0x06, 0xf6, 0x6c, 0xc3, 0x22, 0x6a, 0x8f, 0xa1,
+ 0xad, 0x05, 0x72, 0xc5, 0x78, 0xea, 0x53, 0x21, 0xb8, 0x31, 0xdb, 0x22, 0x9b, 0x37, 0xf8, 0xd9,
+ 0x04, 0x3e, 0xfe, 0x85, 0xa0, 0x5d, 0x09, 0xbc, 0xa7, 0xe2, 0x9a, 0x85, 0x14, 0x0f, 0x60, 0x6b,
+ 0x26, 0xc7, 0xd8, 0x29, 0xef, 0xb9, 0xe8, 0x51, 0xea, 0xec, 0xdf, 0xc3, 0x30, 0xce, 0xdc, 0xc6,
+ 0xef, 0xaf, 0x5e, 0xad, 0x59, 0x3b, 0x42, 0xd8, 0x87, 0xf6, 0x5d, 0xff, 0x78, 0xef, 0x1f, 0xa3,
+ 0xec, 0x38, 0x8b, 0x09, 0xb7, 0x1a, 0x20, 0x0f, 0xf5, 0x8f, 0x3e, 0x4e, 0xc8, 0x49, 0x30, 0xe8,
+ 0x86, 0x7c, 0xd4, 0x33, 0x9f, 0xcf, 0xb8, 0x18, 0xf6, 0x8c, 0x44, 0x4f, 0xbf, 0xb2, 0xbd, 0x21,
+ 0x2f, 0xce, 0xd9, 0x60, 0xd0, 0xd0, 0xd0, 0xf3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x26,
+ 0x14, 0x93, 0xad, 0x05, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.