Repository navigation
Preserve Git-tracked .atomicignore in shim projections - #339
Merged
vinceblock99 merged 3 commits intoNov 15, 2026
Merged
Conversation
Signed-off-by: Mark Hinkle <mrhinkle@peripety.com> Agent-Vendor: codex
Signed-off-by: Mark Hinkle <mrhinkle@peripety.com> Agent-Vendor: codex
Signed-off-by: Mark Hinkle <mrhinkle@peripety.com> Agent-Vendor: codex
Contributor
|
Hi @mrhinkle, thanks for the fix. I reproduced the issue on 0.22.1 and confirmed the fix works. |
vinceblock99
approved these changes
Nov 15, 2026
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.
Problem
A Git checkout with a tracked root
.atomicignoreimports successfully, butatomic git shim verifyreports divergent manifest and index layers. On Atomic's owndevbranch, the projected tree hash was exactly the Git tree hash with only.atomicignoreomitted.Change
.atomicignorein the shim conversion policy when Git HEAD tracks it. Preserve the existing private-file behavior for untracked copies and the independent vault policy..atomicignore.Verification
devat 057c2225f7b2. The fresh import covered all 292 first-parent commits. Both verifier runs exited 0. Atomic's projected tree, Git HEAD, and the Git index agreed ond0ce8b026d4026180e322a3f27160570c9d9378a, with.atomicignorestill tracked and a clean worktree..atomicignoreis local and untracked. The fresh full import continued to report 12 skipped old tags without verified state bindings.Follow-up verification
git_shim_branch_reconcile_regressionpassed at head6a42921on macOS arm64 with Rust 1.98.0. Command:cargo test --locked -p atomic-cli --test it git_shim_branch_reconcile_regression::.6a42921found no blocking issues. The reviewer inspected the diff and verification evidence and did not execute tests. The follow-up source comment explains that the vault policy is persisted and the ignore-file policy follows Git HEAD..atomicignoreacross commits, and promotion of an existing private ignore file to a Git-tracked file. Each reconcile and verify preserved Git HEAD and left the checkout clean.action_requiredwith zero jobs on the current PR run. Could a maintainer approve the fork workflow so the upstream checks can run?