From 36b7f01a8a1bf2d31f3163d64a96aa49a98d0d62 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 25 Sep 2023 12:46:54 +0100 Subject: 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 --- script/update/project/trees | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'script/update/project') 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" -- cgit v1.2.1