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: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v33.0
Choose a base ref
...
head repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v33.1
Choose a head ref
  • 5 commits
  • 55 files changed
  • 5 contributors

Commits on Oct 15, 2025

  1. Configuration menu
    Copy the full SHA
    53f36d3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #23995 from protocolbuffers/33.x-202510152010

    Merge release commits to 33.x
    shaod2 authored Oct 15, 2025
    Configuration menu
    Copy the full SHA
    39d437f View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2025

  1. Fix Any hasbit consistency issue in OSS. (#24400)

    * Fix `Any` hasbit consistency issue in OSS.
    
    `Any` `value` field is a `bytes` field in OSS, and since cl/792909628 (#22956), `_internal_mutable_*()` accessors for string fields don't set hasbits. This can cause the hasbit to be missing for the `value` field of `Any` after calling `PackFrom`, which will serialize incorrectly.
    
    This change also includes fixes to `any_test`, which failed to catch this bug. We got unlucky, and every test which checked a roundtrip `PackFrom` -> `UnpackTo` for an `Any` field reused the same `Any` object, calling `MessageLite::ParseFromString` (which `Clear()`s it) on the same object. However, `Clear()` skips string fields whose hasbits are not set. This meant the `string value` field of the `Any` was not cleared, since its hasbit had not been properly set by `PackFrom`. So even though the `Any` value skipped serializing its value, the reused `Any` object still contained the expected `string value` serialization of the submessage, and `UnpackTo` worked correctly.
    
    The culprit change was adopted in release 33.0, so it will need to be patched to this version.
    
    See #24258.
    
    Fixes #24258
    
    PiperOrigin-RevId: 828299368
    
    * update staleness
    
    * Upgrade setup-php to speed up PHP tests
    
    This build has become a severe bottleneck in our CI.  To avoid this in the future, always use whatever pre-install version is on the mac runners.  The linux tests will cover specific versions of PHP still.
    
    PiperOrigin-RevId: 818864695
    
    ---------
    
    Co-authored-by: Clayton Knittel <cknittel@google.com>
    Co-authored-by: Mike Kruskal <mkruskal@google.com>
    3 people authored Nov 12, 2025
    Configuration menu
    Copy the full SHA
    59db671 View commit details
    Browse the repository at this point in the history
  2. Expose NestedInFileClass naming helpers for Java immutable. (#24401)

    This matches our GeneratorNames APIs, and it's become clear that this information is necessary for certain classes of code-generators to be able to predict where our generated code will end up.
    
    PiperOrigin-RevId: 829216363
    
    Co-authored-by: Mike Kruskal <mkruskal@google.com>
    zhangskz and mkruskal-google authored Nov 12, 2025
    Configuration menu
    Copy the full SHA
    5737cd2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a8d85ff View commit details
    Browse the repository at this point in the history
Loading