diff options
Diffstat (limited to 'vendor/google.golang.org/protobuf/proto/merge.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/proto/merge.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vendor/google.golang.org/protobuf/proto/merge.go b/vendor/google.golang.org/protobuf/proto/merge.go index df72f98952..27ab1a686e 100644 --- a/vendor/google.golang.org/protobuf/proto/merge.go +++ b/vendor/google.golang.org/protobuf/proto/merge.go @@ -21,6 +21,9 @@ import ( // It is semantically equivalent to unmarshaling the encoded form of src // into dst with the UnmarshalOptions.Merge option specified. func Merge(dst, src Message) { + // TODO: Should nil src be treated as semantically equivalent to a + // untyped, read-only, empty message? What about a nil dst? + dstMsg, srcMsg := dst.ProtoReflect(), src.ProtoReflect() if dstMsg.Descriptor() != srcMsg.Descriptor() { panic("descriptor mismatch") |