Skip to content

feat(scaffold): ignore .astro/worktrees/ in default .gitignore#2158

Open
schnie wants to merge 3 commits into
mainfrom
worktrees-gitignore
Open

feat(scaffold): ignore .astro/worktrees/ in default .gitignore#2158
schnie wants to merge 3 commits into
mainfrom
worktrees-gitignore

Conversation

@schnie

@schnie schnie commented May 28, 2026

Copy link
Copy Markdown
Member

Summary

  • Add .astro/worktrees/ to the scaffold's .gitignore template (parallels the existing .astro/standalone/ entry)
  • Update scaffold test to assert the new entry is present

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/exclude instead (untracked, per-clone), so this PR only affects projects newly scaffolded by astro dev init.

Test plan

  • go test ./... in pkg/airflowrt/
  • Manual: astro dev init → confirm .gitignore contains the new entry

🤖 Generated with Claude Code

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>
@schnie schnie requested a review from a team as a code owner May 28, 2026 17:11
@coveralls-official

coveralls-official Bot commented May 28, 2026

Copy link
Copy Markdown

Coverage Report for CI Build 92954340

Coverage remained the same at 44.776%

Details

  • Coverage remained the same as the base build.
  • Patch coverage: No coverable lines changed in this PR.
  • No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 55900
Covered Lines: 25030
Line Coverage: 44.78%
Coverage Strength: 7.75 hits per line

💛 - Coveralls

@akshayarora akshayarora left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants