From 81d073d5a193f2a07ca8efbb1a337a69c1c6d778 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 25 Sep 2023 12:17:02 +0100 Subject: update/project/*: unified git reset handling With this change, lbmk now also updates submodules on simple git clones, not just multi-tree clones. This is OK, because git does not return non-zero status when git submodule update is ran, where git submodules are not actually defined. Signed-off-by: Leah Rowe --- script/update/project/trees | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'script/update/project/trees') diff --git a/script/update/project/trees b/script/update/project/trees index 27418f19..af8e4ed0 100755 --- a/script/update/project/trees +++ b/script/update/project/trees @@ -143,13 +143,9 @@ prepare_new_tree() cp -R "${project}/${project}" "${project}/${tree}" || \ err "${project}/${tree}: cannot copy source tree" - ( - cd "${project}/${tree}" || err "cannot cd to ${project}/${tree}" - git reset --hard ${rev} || \ - err "cannot reset ${project} revision for tree, ${tree}" - git submodule update --init --checkout || \ - err "cannot update ${project} submodules for tree, ${tree}" - ) + git_reset_rev "${project}/${tree}" "${rev}" "err" || \ + err "prepare_new_trees ${project}/${tree}: cannot reset <- ${rev}" + git_am_patches "${PWD}/${project}/${tree}" \ "${PWD}/${cfgsdir}/${tree}/patches" "err" || \ err "prepare_new_trees ${project}/${tree}: cannot apply patches" -- cgit v1.2.1