From 2aea7f622949ecdc9b1a434eff8c789a357e4c67 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 17 Oct 2025 16:07:16 +0100 Subject: Revert "get.sh: make forcepull a macro" This reverts commit b3232a7c4a6466381d798d7beda56fd020d86d54. --- include/get.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'include/get.sh') 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 # Copyright (c) 2022 Caleb La Grange -# 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 -- cgit v1.2.1