From 3b22cd19785665f3ba671560974f4d2cd600cce6 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 15 Nov 2021 14:00:33 -0800 Subject: [PATCH] [release/6.0] Use googletest's new 'main' branch (#38410) - backport of #38409 due to submodule conflicts --- .gitmodules | 2 +- src/submodules/googletest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 61a1838b7546..c62b0c079d0b 100644 --- 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 index 16f637fbf4ff..4848324c5ff3 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 16f637fbf4ffc3f7a01fa4eceb7906634565242f +Subproject commit 4848324c5ff3186a7f72a674f6760d0b8da585d7