From 5b8928c7c9bc3916f67f377f47d6f87039df179f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 19 May 2024 07:50:24 +0100 Subject: 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 --- include/git.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'include/git.sh') diff --git a/include/git.sh b/include/git.sh index bc818b19..5111d09a 100755 --- a/include/git.sh +++ b/include/git.sh @@ -7,7 +7,8 @@ eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree)" fetch_project_trees() { _target="${target}" - [ -d "src/${project}/${project}" ] || fetch_from_upstream + [ ! -d "src/${project}/${project}" ] && x_ mkdir -p "src/${project}" \ + && fetch_project_repo "${project}" fetch_config if [ -d "src/${project}/${tree}" ]; then printf "download/%s %s (%s): exists\n" \ @@ -17,14 +18,6 @@ fetch_project_trees() prepare_new_tree } -fetch_from_upstream() -{ - [ -d "src/${project}/${project}" ] && return 0 - - x_ mkdir -p "src/${project}" - fetch_project_repo "${project}" -} - fetch_config() { rm -f "${cfgsdir}/"*/seen || $err "fetch_config ${cfgsdir}: !rm seen" -- cgit v1.2.1