summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-01-26 11:15:23 +0000
committerLeah Rowe <leah@libreboot.org>2024-01-26 11:15:23 +0000
commit9071160c7a52bd9eda406bb5c5e450aeca541a31 (patch)
tree1d7c9652f36c8a62e0f85e2f707c97f8c41987f2
parent39688ebee6b5d734aaef41a3e61edc80007db001 (diff)
git.sh: also reset xtree/tree_depend here
it's still necessary here, to prevent the same bug identified in the previous patch. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xinclude/git.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/git.sh b/include/git.sh
index b19e02b6..1fb8046d 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -30,6 +30,7 @@ fetch_from_upstream()
fetch_config()
{
rm -f "${cfgsdir}/"*/seen || err "fetch_config ${cfgsdir}: !rm seen"
+ eval "$(setvars "" xtree tree_depend)"
while true; do
eval "$(setvars "" rev tree)"
_xm="fetch_config ${project}/${_target}"
@@ -62,6 +63,8 @@ prepare_new_tree()
fetch_project_repo()
{
+ eval "$(setvars "" xtree tree_depend)"
+
scan_config "${project}" "config/git" "err"
[ -z "${loc+x}" ] && err "fetch_project_repo $project: loc not set"
[ -z "${url+x}" ] && err "fetch_project_repo $project: url not set"