feat(scaffold): ignore .astro/worktrees/ in default .gitignore - #2158
Merged
Conversation
astro-desktop (and the otto CLI) host per-branch git worktrees under <project>/.astro/worktrees/ so they travel with the project and are discoverable by both tools at the same path. Adding the entry to the scaffold's .gitignore template keeps the nested worktrees out of git tracking by default — parallels the existing .astro/standalone/ ignore for the local Airflow runtime state. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Coverage Report for CI Build 28717837699Coverage remained the same at 45.328%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsNo coverage regressions found. Coverage Stats
💛 - Coveralls |
akshayarora
approved these changes
May 28, 2026
akshayarora
left a comment
Contributor
There was a problem hiding this comment.
This is great, thank you.
jlaneve
approved these changes
Jul 4, 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
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.
Summary
.astro/worktrees/to the scaffold's.gitignoretemplate (parallels the existing.astro/standalone/entry)Motivation
astro-desktop is moving per-branch git worktrees from a shared home-dir location (
~/.astro-desktop/worktrees/<project>/) into the project itself at<project>/.astro/worktrees/. The otto CLI uses the same path so both tools see the same worktrees. Without this template change, those nested worktrees would show up as untracked in new projects.For existing projects astro-desktop writes the entry to
.git/info/excludeinstead (untracked, per-clone), so this PR only affects projects newly scaffolded byastro dev init.Test plan
go test ./...inpkg/airflowrt/astro dev init→ confirm.gitignorecontains the new entry🤖 Generated with Claude Code