From 633b95db4fa8b90015ece3b14bd4395696b454a2 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 3 May 2026 10:20:21 +0000 Subject: [PATCH] Reset before recreating build branch --- contrib/agrarian-build-menu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/agrarian-build-menu.sh b/contrib/agrarian-build-menu.sh index 753d7366..4ff8e679 100755 --- a/contrib/agrarian-build-menu.sh +++ b/contrib/agrarian-build-menu.sh @@ -482,8 +482,8 @@ ensure_repo() { if [[ -d "$WORKDIR/.git" ]]; then ROOT="$WORKDIR" run_step 25 "Fetching existing Agrarian checkout" git -C "$ROOT" fetch origin "$BRANCH" - run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout -B "$BRANCH" "origin/$BRANCH" - run_step 35 "Resetting checkout to origin/$BRANCH" git -C "$ROOT" reset --hard "origin/$BRANCH" + run_step 30 "Resetting checkout to origin/$BRANCH" git -C "$ROOT" reset --hard "origin/$BRANCH" + run_step 35 "Checking out $BRANCH" git -C "$ROOT" checkout -B "$BRANCH" "origin/$BRANCH" run_step 37 "Removing local untracked checkout files" git -C "$ROOT" clean -fd else mkdir -p "$(dirname "$WORKDIR")"