fix: stash local shared untracked on update

Signed-off-by: Josef Andersson <josef.andersson@digg.se>

Author: janderssonse

scripts/setup.sh

@@ -29,8 +29,8 @@ update_to_version() {
   local version="$1"
   # Fetch only the specific tag, shallow
   git -C "$DIR" fetch --depth 1 origin tag "$version" --quiet
-  # Stash any local changes to avoid checkout conflicts
-  git -C "$DIR" stash --quiet 2>/dev/null || true
+  # Stash any local changes (including untracked files) to avoid checkout conflicts
+  git -C "$DIR" stash --include-untracked --quiet 2>/dev/null || true
   git -C "$DIR" checkout "$version" --quiet
   print_success "Updated to $version"
 }

tests/setup.bats

@@ -109,3 +109,64 @@ teardown() {
   marker_age=$(find "$fake_dir/.last-update-check" -mmin +1 2>/dev/null || true)
   assert_equal "$marker_age" ""
 }
+
+# =============================================================================
+# Update with untracked files tests
+# =============================================================================
+
+@test "setup.sh update handles untracked files without failing" {
+  setup_isolated_home
+  local fake_dir="${TEST_DIR}/devtools"
+  local remote_dir="${TEST_DIR}/remote.git"
+  
+  # Create local repo with two commits and tags
+  mkdir -p "$fake_dir"
+  cd "$fake_dir"
+  export GIT_CONFIG_NOSYSTEM=1
+  export GIT_CONFIG_GLOBAL="${HOME}/.gitconfig"
+  export GIT_EDITOR=true  # Prevent editor from opening
+  git init -q --initial-branch=main
+  git config user.email "test@example.com"
+  git config user.name "Test"
+  echo "initial" > README.md
+  git add README.md
+  git commit -q -m "Initial commit"
+  git tag -a v1.0.0 -m "v1.0.0"  # Use annotated tag with message
+  
+  # Make a new commit and tag v1.0.1
+  echo "updated" > README.md
+  git add README.md
+  git commit -q -m "Update"
+  git tag -a v1.0.1 -m "v1.0.1"
+  
+  # Create a bare remote and push everything
+  git init -q --bare "$remote_dir"
+  git remote add origin "$remote_dir"
+  git push --all origin 2>/dev/null
+  git push --tags origin 2>/dev/null
+  
+  # Go back to v1.0.0 (simulating outdated install)
+  git checkout v1.0.0 --quiet
+  
+  # Create untracked files (simulating user's local experiments)
+  # These would conflict with checkout if not handled properly
+  echo "my local test" > untracked-test-file.txt
+  mkdir -p new-utils
+  echo "local utility" > new-utils/my-util.sh
+  
+  # Create old marker to trigger update check
+  touch "$fake_dir/.last-update-check"
+  touch -d "61 minutes ago" "$fake_dir/.last-update-check"
+  
+  # Run setup in non-interactive mode (CI=true auto-updates)
+  export CI=true
+  run "$SCRIPT_DIR/setup.sh" "$remote_dir" "$fake_dir"
+  
+  assert_success
+  assert_output --partial "Updated to v1.0.1"
+  
+  # Verify we're now on v1.0.1
+  cd "$fake_dir"
+  run git describe --tags --abbrev=0
+  assert_output "v1.0.1"
+}