From 6879006d5474a1e47b570f1bd1a93195c0d48ba4 Mon Sep 17 00:00:00 2001 From: Carolyn Zech Date: Thu, 15 Aug 2024 18:53:11 -0400 Subject: [PATCH] clone submodules when updating subtree --- scripts/pull_from_upstream.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/pull_from_upstream.sh b/scripts/pull_from_upstream.sh index 183d258837eb8..a9e288904f89c 100755 --- a/scripts/pull_from_upstream.sh +++ b/scripts/pull_from_upstream.sh @@ -22,4 +22,10 @@ git fetch origin git checkout -b ${SYNC_BRANCH} origin/main git subtree merge --prefix=library subtree/library --squash +# 4. Pull library's submodules +# The subtree command does not recursively pull submodules, so we do this manually. +cd library +git clone https://github.com/rust-lang/backtrace-rs.git +git clone https://github.com/rust-lang/stdarch.git + # TODO: Update origin/subtree/library as well after the process by pushing to it