tree 52632fc79a0d039d476dd4c43b2fa2143accc8cf
parent efdf02ed5fb3e5af2fcd022ea12df7abf402f0d2
author Joe Tsai <joetsai@digital-static.net> 1568510579 -0700
committer Joe Tsai <joetsai@digital-static.net> 1568754822 +0000

proto: reset message by default in Unmarshal

We change Unmarshal to reset a message by default.
* We add a Merge option to UnmarshalOptions for explicit merging.
* We speed up Reset by checking for the Reset method.
* Remove TODOs in prototext and protojson about reset behavior.

Fixes golang/protobuf#890

Change-Id: Ibd8963c741053f564acf061fbdb846699942109c
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195457
Reviewed-by: Damien Neil <dneil@google.com>