Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: golang/protobuf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.2
Choose a base ref
...
head repository: golang/protobuf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.5.3
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 15, 2021

  1. jsonpb: accept 'null' as a valid representation of NullValue in unmar… 

    …shal

The canonical JSON representation for NullValue is JSON "null".

Fixes github.com/#1361.
    @neild
    neild committed Sep 15, 2021
    Copy the full SHA
    37828f9 View commit details

Commits on Sep 16, 2021

  1. Merge pull request #1363 from neild/jsonnull 

    jsonpb: accept 'null' as a valid representation of NullValue in unmarshal
    @neild
    neild authored Sep 16, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5d5e8c0 View commit details
Showing with 123 additions and 97 deletions.
  1. +113 −96 internal/testprotos/jsonpb_proto/test2.pb.go
  2. +1 −0 internal/testprotos/jsonpb_proto/test2.proto
  3. +7 −1 jsonpb/decode.go
  4. +2 −0 jsonpb/json_test.go
Loading