From 36b7f01a8a1bf2d31f3163d64a96aa49a98d0d62 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 25 Sep 2023 12:46:54 +0100
Subject: [PATCH] only update git submodules in project/trees

do not update them in project/repos - despite what
the previous commit message says, this behaviour is
error prone and should be avoided.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/git.sh              | 2 --
 script/update/project/trees | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/git.sh b/include/git.sh
index 1ad84d11..2bf3b761 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -10,8 +10,6 @@ git_reset_rev()
 	cd "${sdir}" || "${_fail}" "cannot cd to ${sdir}"
 	git reset --hard ${_rev} || \
 	    "${_fail}" "cannot git reset ${sdir} <- ${rev}"
-	git submodule update --init --checkout || \
-	    "${_fail}" "cannot update git modules <- ${sdir}"
 	)
 }
 
diff --git a/script/update/project/trees b/script/update/project/trees
index af8e4ed0..084ef1e3 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -146,6 +146,13 @@ prepare_new_tree()
 	git_reset_rev "${project}/${tree}" "${rev}" "err" || \
 	    err "prepare_new_trees ${project}/${tree}: cannot reset <- ${rev}"
 
+	(
+	cd "${project}/${tree}" || \
+	    err "prepare_new_tree: !cd \"${project}/${tree}\""
+	git submodule update --init --checkout || \
+	    err "prepare_new_tree ${project}/${tree}: can't update git modules"
+	)
+
 	git_am_patches "${PWD}/${project}/${tree}" \
 	    "${PWD}/${cfgsdir}/${tree}/patches" "err" || \
 	    err "prepare_new_trees ${project}/${tree}: cannot apply patches"