fix(ce-commit-push-pr): preserve ignored files during branch switches - #1647
Merged
tmchow merged 2 commits intoSep 10, 2026
Merged
Conversation
Abort direct tree-changing checkouts on ignored-path collisions instead of silently overwriting local files or retrying through stash -u. Apply one shared preservation condition to ordinary and stack workflows, including topology changes, without requiring a clean worktree. Correct the upstack checkout argument order while retaining the authoritative parent tip. Add isolated real-Git regression tests and keep the existing stack contract aligned with the protected recipe. Port the five reviewed fix/test blobs from fork PR #5 unchanged onto upstream 098ccdb. The resulting tree is identical to the integrated fork validation commit 49f9e7a.
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. |
Retain --no-overwrite-ignore and stop-on-collision on the two branch recipes. Remove the extra reference and the unverifiable gh-stack probe. Co-authored-by: Trevin Chow <tmchow@users.noreply.github.com>
|
Slimmed this on the branch. Kept Real-Git tests that execute the shipped recipes still pass. |
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
3 participants
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.
Fixes #1646.
git checkout -bsilently overwrites ignored local files (e.g..env) when the target commit tracks that path.git stash push -udoes not save ignored files, so the documented retry still loses them. The upstack recipegit checkout -b -- "<name>" "<tip>"is also invalid (--becomes the branch name).Change
git checkout --no-overwrite-ignore -b …on the ordinary and upstack recipes.Dropped the extra
worktree-safety.mdlayer and the “establish thatgh stackpreserves local paths” probe.Validation
bun test tests/commit-push-pr-worktree-safety.test.ts tests/commit-push-pr-contract.test.ts— 32 pass, including ignored.envoverwrite stop, non-colliding dirty work, and no-stash collisions.Security Disclosure
Prevents silent overwrite of ignored local files during an authorized branch switch. Residual:
gh stack classify/ other tree-changing stack CLI calls are not covered by this flag; collision handling there is unchanged.Agent Disclosure