Skip to content

Fix Vast results push from merge commits - #18

Open
Al-does wants to merge 1 commit into
mainfrom
cursor/vast-results-rebase-merge-fix-4df7
Open

Fix Vast results push from merge commits#18
Al-does wants to merge 1 commit into
mainfrom
cursor/vast-results-rebase-merge-fix-4df7

Conversation

@Al-does

@Al-does Al-does commented Jul 29, 2026

Copy link
Copy Markdown
Owner

Summary

  • Vast self_destruct now rebases only the tip results commit (--onto FETCH_HEAD HEAD~1) onto the orphan results branch.
  • This unblocks teardown when boxes train from a merged PR SHA; the previous full rebase failed recreating merge commits and preserved boxes after successful B2 uploads.
  • Adds a unit test for the rebase argv.

Test plan

  • uv run pytest -q tests/test_infra_safeguards.py -k self_destruct (7 passed)
  • Manually verified the same rebase command pushed cycle-2 seed42 results from a merge-commit checkout

Replay only the tip results commit onto the results branch. Full
`git rebase FETCH_HEAD` fails on PR merge SHAs and left completed
boxes unreaped after successful B2 uploads.
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.

2 participants