Merge tag 'refs/tags/sync-piper' into sync-stage

bithium · Apr 16, 2021 · 6172e9a · 6172e9a
2 parents ea62d1b + 8ba5f49
commit 6172e9a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/google/protobuf/unittest.proto b/google/protobuf/unittest.proto
@@ -364,6 +364,12 @@ message TestNestedExtension {
   }
 }
 
+message TestChildExtension {
+  optional string a = 1;
+  optional string b = 2;
+  optional TestAllExtensions optional_extension = 3;
+}
+
 // We have separate messages for testing required fields because it's
 // annoying to have to fill in required fields in TestProto in order to
 // do anything with it.  Note that we don't need to test every type of