From 8d83340da4853fe1d1e9a5f89785bbbd6dda6d23 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 26 Jan 2024 11:15:23 +0000 Subject: [PATCH] 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 --- include/git.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/git.sh b/include/git.sh index 47947ca..50f3e42 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}" @@ -63,6 +64,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"