1 files changed, 16 insertions, 50 deletions

diff --git a/include/git.sh b/include/git.sh
index e0eb196b..b0acd7dc 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -2,58 +2,28 @@
 # Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
 # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
 
-eval `setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree \
-    mdir subhash subrepo subrepo_bkup subfile subfile_bkup`
+eval `setvars "" loc url bkup_url subfile mdir subhash subrepo subrepo_bkup \
+    depend subfile_bkup`
 
-fetch_project_trees()
+fetch_targets()
 {
-	_target="$target"
-	[ ! -d "src/$project/$project" ] && x_ mkdir -p "src/$project" \
-	    && fetch_project_repo "$project"
-	fetch_config
-	e "src/$project/$tree" d || prepare_new_tree; return 0
-}
-
-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"
-		load_target_config "$_target"
-		[ "$_target" = "$tree" ] && break
-		_target="$tree"
-	done
 	[ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \
-		x_ ./update trees -f "$project" "$tree_depend"; return 0
-}
-
-load_target_config()
-{
-	[ -f "$cfgsdir/$1/seen" ] && $err "$_xm cfg: infinite loop in trees"
-	eval `setcfg "$cfgsdir/$1/target.cfg"`
-	touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen"
-}
-
-prepare_new_tree()
-{
-	printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
+		x_ ./update trees -f "$project" "$tree_depend"
+	e "src/$project/$tree" d && return 0
 
-	git_prep "src/$project/$project" "src/$project/$project" \
-	    "$PWD/$cfgsdir/$tree/patches" "src/$project/$tree" "update"
-	nuke "$project/$tree" "$project/$tree"
+	printf "Creating %s tree %s\n" "$project" "$tree"
+	git_prep "$loc" "$loc" "$PWD/$cfgsdir/$tree/patches" \
+	    "${loc%/*}/$tree" u; nuke "$project/$tree" "$project/$tree"
 }
 
-fetch_project_repo()
+fetch_project()
 {
 	eval `setvars "" xtree tree_depend`
 	eval `setcfg "config/git/$project/pkg.cfg"`
 
 	chkvars url
 
-	[ -n "$xtree" ] && [ ! -d "src/coreboot/$xtree" ] && \
-		x_ ./update trees -f coreboot "$xtree"
+	[ -n "$xtree" ] && x_ ./update trees -f coreboot "$xtree"
 	[ -z "$depend" ] || for d in $depend ; do
 		printf "'%s' needs '%s'; grabbing '%s'\n" "$project" "$d" "$d"
 		x_ ./update trees -f $d
@@ -67,8 +37,7 @@ fetch_project_repo()
 
 clone_project()
 {
-	loc="src/$project"
-	singletree "$project" || loc="src/$project/$project"
+	loc="src/$project/$project" && singletree "$project" && loc="${loc%/*}"
 
 	printf "Downloading project '%s' to '%s'\n" "$project" "$loc"
 	e "$loc" d && return 0
@@ -141,14 +110,11 @@ tmpclone()
 
 git_am_patches()
 {
-	for _patch in "$2/"*; do
-		[ -L "$_patch" ] || [ ! -f "$_patch" ] || git -C "$1" am \
-		    "$_patch" || $err "$1 $2: !git am $_patch"; continue
-	done
-	for _patches in "$2/"*; do
-		[ ! -L "$_patches" ] && [ -d "$_patches" ] && \
-			git_am_patches "$1" "$_patches"; continue
-	done
+	for p in "$2/"*; do
+		[ -L "$p" ] && continue; [ -e "$p" ] || continue
+		[ -d "$p" ] && git_am_patches "$1" "$p" && continue
+		[ ! -f "$p" ] || git -C "$1" am "$p" || $err "$1 $2: !am $p"
+	done; return 0
 }
 
 link_crossgcc()