Repository navigation
Fix shadow rendering for .git materialization - #114
Merged
Merged
Conversation
graywolf336
approved these changes
Jul 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.
This pull request introduces support for bootstrapping Atomic into an existing Git checkout using the new
--into-existingoption for theclonecommand. It ensures that Atomic can be initialized in a Git working tree without overwriting Git-managed files, validates the target directory, and adjusts materialization logic to respect Git's ownership of the worktree. Additionally, it improves repository handling to never move or touch.gitdirectories during view switches, and it adds comprehensive tests for the new behavior.New
--into-existingclone mode:--into-existingflag to theClonecommand, allowing users to bootstrap Atomic into an existing Git working tree without materializing Atomic content over Git-managed files. This includes validation to ensure the target is a non-bare Git repository at its worktree root and not already an Atomic repository. [1] [2]--into-existingis used, Atomic does not overwrite the working copy and instead prompts the user to runatomic git import --incrementalas the next step. [1] [2]Repository and view switch improvements:
.gitdirectories during view switches, ensuring Git administrative data is always preserved and managed by Git, not Atomic. [1] [2]Testing and validation:
--into-existingoption, including validation of acceptable and unacceptable target directories, and updates builder tests to cover the new flag. [1] [2] [3]Shell test enhancements:
Output and user guidance:
--into-existing, and provides hints for next steps. [1] [2]These changes ensure a safe and user-friendly integration between Atomic and existing Git repositories, preventing accidental overwrites and clarifying user workflows.