diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-10-17 16:07:16 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-10-17 16:07:16 +0100 |
| commit | 2aea7f622949ecdc9b1a434eff8c789a357e4c67 (patch) | |
| tree | 47ef11ea8028978527a47e3f302b26f53e624b48 | |
| parent | b3232a7c4a6466381d798d7beda56fd020d86d54 (diff) | |
Revert "get.sh: make forcepull a macro"
This reverts commit b3232a7c4a6466381d798d7beda56fd020d86d54.
| -rw-r--r-- | include/get.sh | 9 | ||||
| -rw-r--r-- | include/tree.sh | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/get.sh b/include/get.sh index 1c5ae58c..e3e4c311 100644 --- a/include/get.sh +++ b/include/get.sh @@ -3,9 +3,6 @@ # Copyright (c) 2020-2021,2023-2025 Leah Rowe <leah@libreboot.org> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> -# macro; ./mk -F sets it to : -if_not_force_pull="" - url="" bkup_url="" @@ -314,14 +311,14 @@ try_git() x_ mv "$tmpgitcache" "$gitdest" fi - if git -C "$gitdest" show "$7" 1>/dev/null 2>/dev/null; then + if git -C "$gitdest" show "$7" 1>/dev/null 2>/dev/null && \ + [ "$forcepull" != "y" ]; then # don't try to pull the latest changes if the given target # revision already exists locally. this saves a lot of time # during release builds, and reduces the chance that we will # interact with grub.git or gnulib.git overall during runtime - $if_not_force_pull \ - return 0 + return 0 fi if [ "$XBMK_CACHE_MIRROR" = "y" ]; then diff --git a/include/tree.sh b/include/tree.sh index 51e55421..166a3d86 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -26,6 +26,7 @@ cmd="" defconfig="" dest_dir="" elfdir="" +forcepull="" gccdir="" gccfull="" gccver="" @@ -92,7 +93,7 @@ trees() if [ "$flag" = "-F" ]; then # don't skip git fetch/pull on cached src - if_not_force_pull=":" + forcepull="y" fi ;; -s) mode="savedefconfig" ;; |