libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

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>
btrfsvols
Leah Rowe 2023-09-25 12:46:54 +01:00
parent 81d073d5a1
commit 36b7f01a8a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/git.sh
View File

@ -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}"
)
}

7
script/update/project/trees
View File

@ -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"