git.sh: remove fetch_from_upstream()

the function is very small and only called once,
from fetch_project_trees()

merge it into fetch_project_trees()

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-05-19 07:50:24 +01:00 committed by Leah Rowe
parent ddcb793bd2
commit 10ecf41ee0
1 changed files with 2 additions and 9 deletions

View File

@ -7,7 +7,8 @@ eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree)"
fetch_project_trees() fetch_project_trees()
{ {
_target="${target}" _target="${target}"
[ -d "src/${project}/${project}" ] || fetch_from_upstream [ ! -d "src/${project}/${project}" ] && x_ mkdir -p "src/${project}" \
&& fetch_project_repo "${project}"
fetch_config fetch_config
if [ -d "src/${project}/${tree}" ]; then if [ -d "src/${project}/${tree}" ]; then
printf "download/%s %s (%s): exists\n" \ printf "download/%s %s (%s): exists\n" \
@ -17,14 +18,6 @@ fetch_project_trees()
prepare_new_tree prepare_new_tree
} }
fetch_from_upstream()
{
[ -d "src/${project}/${project}" ] && return 0
x_ mkdir -p "src/${project}"
fetch_project_repo "${project}"
}
fetch_config() fetch_config()
{ {
rm -f "${cfgsdir}/"*/seen || $err "fetch_config ${cfgsdir}: !rm seen" rm -f "${cfgsdir}/"*/seen || $err "fetch_config ${cfgsdir}: !rm seen"