fix: add stash before updating

janderssonse · janderssonse · commit 0957c8c2713a · 2025-12-11T18:19:11.000+01:00
Signed-off-by: Josef Andersson &lt;josef.andersson@digg.se&gt;
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -28,6 +28,8 @@ get_latest_version() {
 update_to_version() {
   local version="$1"
   git -C "$DIR" fetch --all --quiet
+  # Stash any local changes to avoid checkout conflicts
+  git -C "$DIR" stash --quiet 2>/dev/null || true
   git -C "$DIR" checkout "$version" --quiet
   print_success "Updated to $version"
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ get_latest_version() {`
`28`	`28`	`update_to_version() {`
`29`	`29`	`local version="$1"`
`30`	`30`	`git -C "$DIR" fetch --all --quiet`
	`31`	`+ # Stash any local changes to avoid checkout conflicts`
	`32`	`+ git -C "$DIR" stash --quiet 2>/dev/null \|\| true`
`31`	`33`	`git -C "$DIR" checkout "$version" --quiet`
`32`	`34`	`print_success "Updated to $version"`
`33`	`35`	`}`