Skip to content

fix(ci): use --autostash on daily forecast rebase#31

Merged
jgamblin merged 1 commit into
mainfrom
fix/daily-push-autostash
Apr 28, 2026
Merged

fix(ci): use --autostash on daily forecast rebase#31
jgamblin merged 1 commit into
mainfrom
fix/daily-push-autostash

Conversation

@jgamblin
Copy link
Copy Markdown
Collaborator

Summary

The rebase-before-push fix in #30 exposed a second issue: the production forecast run dirties files beyond the five we explicitly stage (most likely code/cna_count_cache.json), so git pull --rebase after the commit fails with:

error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them.

Adding --autostash lets rebase stash the dirty tree automatically and restore it afterward. One-line change.

Evidence

Failing run on main after #30: https://github.com/RogoLabs/CVEForecast/actions/runs/25073725056

Test plan

  • CI green on this PR (Lint + Tests).
  • Post-merge, next daily forecast run succeeds through the push step.

🤖 Generated with Claude Code

The forecast run writes files outside the five we explicitly stage
(e.g., code/cna_count_cache.json), leaving the working tree dirty after
`git commit`. That tripped `git pull --rebase` with "cannot pull with
rebase: You have unstaged changes." Adding --autostash lets rebase
handle the dirty tree.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@jgamblin jgamblin merged commit 85a1a78 into main Apr 28, 2026
2 checks passed
@jgamblin jgamblin deleted the fix/daily-push-autostash branch April 28, 2026 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant