[release/6.0] Use googletest's new 'main' branch (#38410)

- backport of #38409 due to submodule conflicts
dotnet · Nov 15, 2021 · 3b22cd1 · 3b22cd1
1 parent df78957
commit 3b22cd1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "src/submodules/googletest"]
 	path = src/submodules/googletest
 	url = https://github.com/google/googletest
-	branch = master
+	branch = main
 [submodule "src/submodules/MessagePack-CSharp"]
 	path = src/submodules/MessagePack-CSharp
 	url = https://github.com/aspnet/MessagePack-CSharp.git

diff --git a/src/submodules/googletest b/src/submodules/googletest
+58 −2		docs/advanced.md
+5 −5		docs/quickstart-bazel.md
+3 −3		googlemock/test/gmock-internal-utils_test.cc
+8 −6		googlemock/test/gmock-matchers_test.cc
+6 −0		googletest/include/gtest/gtest-printers.h
+5 −0		googletest/include/gtest/gtest.h
+43 −77		googletest/include/gtest/internal/gtest-port.h
+2 −22		googletest/src/gtest-port.cc
+20 −8		googletest/src/gtest.cc
+8 −4		googletest/test/googletest-port-test.cc
+10 −0		googletest/test/googletest-printers-test.cc
+12 −69		googletest/test/gtest_test_utils.py