nathan/agrarian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset build checkout before pulling

Browse Source
This commit is contained in:
root
2026-05-03 10:13:07 +00:00
parent c2354607cf
commit 3317191540
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/agrarian-build-menu.sh
+1
View File
@@ -482,6 +482,7 @@ ensure_repo() {
if [[ -d "$WORKDIR/.git" ]]; then if [[ -d "$WORKDIR/.git" ]]; then
ROOT="$WORKDIR" ROOT="$WORKDIR"
run_step 25 "Fetching existing Agrarian checkout" git -C "$ROOT" fetch origin "$BRANCH" run_step 25 "Fetching existing Agrarian checkout" git -C "$ROOT" fetch origin "$BRANCH"
run_step 27 "Resetting local checkout files" git -C "$ROOT" reset --hard HEAD
run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout "$BRANCH" run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout "$BRANCH"
run_step 35 "Fast-forwarding $BRANCH" git -C "$ROOT" pull --ff-only origin "$BRANCH" run_step 35 "Fast-forwarding $BRANCH" git -C "$ROOT" pull --ff-only origin "$BRANCH"
else else