From 5536049d5504f5b50b51f94c0ab5173d723d6492 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Mon, 10 Oct 2022 22:04:16 -0400
Subject: [PATCH] Bootstrap should sync submodules. (#23095)

When submodule URLs change, re-bootstrap will fail unless something does "git
submodule sync".  We should just do that as part of bootstrap, instead of
assuming that developers know to do it.

Fixes https://github.com/project-chip/connectedhomeip/issues/23059
---
 scripts/bootstrap.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index af1b567f081276..9e653ff5ae2b85 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -32,6 +32,8 @@ _bootstrap_or_activate() {
 
     if [ "$_BOOTSTRAP_NAME" = "bootstrap.sh" ] ||
         [ ! -f "$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/util.sh" ]; then
+        # Make sure our submodule remotes are correct for this revision.
+        git submodule sync --recursive
         git submodule update --init
     fi