mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Update Vendor (#16325)
* Add Dependencie Update Script * update gitea.com/lunny/levelqueue * update github.com/PuerkitoBio/goquery * update github.com/alecthomas/chroma * update github.com/blevesearch/bleve/v2 * update github.com/caddyserver/certmagic * update github.com/go-enry/go-enry/v2 * update github.com/go-redis/redis/v8 * update github.com/hashicorp/golang-lru * update github.com/klauspost/compress * update github.com/markbates/goth * update github.com/mholt/archiver/v3 * update github.com/microcosm-cc/bluemonday * update github.com/minio/minio-go/v7 * update github.com/olivere/elastic/v7 * update github.com/xanzy/go-gitlab * update github.com/yuin/goldmark
This commit is contained in:
		
							
								
								
									
										7
									
								
								vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/google.golang.org/protobuf/internal/impl/legacy_message.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -440,6 +440,13 @@ func legacyMerge(in piface.MergeInput) piface.MergeOutput { | ||||
| 	if !ok { | ||||
| 		return piface.MergeOutput{} | ||||
| 	} | ||||
| 	if !in.Source.IsValid() { | ||||
| 		// Legacy Marshal methods may not function on nil messages. | ||||
| 		// Check for a typed nil source only after we confirm that | ||||
| 		// legacy Marshal/Unmarshal methods are present, for | ||||
| 		// consistency. | ||||
| 		return piface.MergeOutput{Flags: piface.MergeComplete} | ||||
| 	} | ||||
| 	b, err := marshaler.Marshal() | ||||
| 	if err != nil { | ||||
| 		return piface.MergeOutput{} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user