Repository navigation
fix(ci): refresh.sh resets the train's worktree before checking out the next PR - #338
Merged
Merged
Conversation
…he next PR A dry refresh, or one that failed after regenerating the baseline or the coverage page, left those files modified, and git merge --abort does not touch them; the next checkout then refused (#298 review).
DrunkOnJava
enabled auto-merge (squash)
October 26, 2026 17:56
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
A dry refresh, or a refresh that fails after regenerating tools/corpus/baseline.tsv or docs/spec-coverage.md, leaves those files modified in the train's worktree.
git merge --abortonly undoes a merge in progress, so the nextgit checkout --detach origin/<branch>refuses whenever the next PR differs in one of those files, and the train stops on that PR with exit 2. The worktree belongs to the train (TRAIN_WORKTREE), so refresh.sh now runsgit reset --hardthere before every checkout. Fixes the first #298 review thread; the other two are in #336.Spec reference
None; repository tooling (merge train, #298).
Test plan
bash -n tools/maintainer/train/refresh.sh.git merge --abort; git reset --hardfirst, the checkout succeeds (head 1afeacb, 0 dirty files).Source-provenance declaration
Written for this repository; no external source consulted.