Repository navigation
Delphi 1.2.0: worktrees get their own store, separate from the repos/ clone - #77
Merged
Merged
Conversation
The clone at repos/<name> is detached at the same commit if it was on that branch, so the branch can live at worktrees/<name>/<default-branch>. CLAUDE.md copies point the model at worktrees. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019JfJ7chmBadZ9hkhEGFN2h
bracyw
marked this pull request as draft
October 19, 2026 00:12
setup.sh keeps repos/<name> a plain clone and, separately, makes worktrees/<name>/.bare plus the default-branch worktree; new-worktree.sh and skill scripts use that store. Replaces detaching the clone. Migration 2.0.0 moves an old bare store at repos/<name> there, worktrees intact. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019JfJ7chmBadZ9hkhEGFN2h
An older bare store at repos/<name> is left as it is (as 1.1.0 did); setup.sh adds the store in worktrees/ beside it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019JfJ7chmBadZ9hkhEGFN2h
bracyw
marked this pull request as ready for review
October 19, 2026 00:26
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.
Changes
repos/<name>stays a plain clone of its own, and no worktrees are made from it.setup.shalso fetches each repo into a separate bare store atworktrees/<name>/.bareand checks out the default branch there (for Argos,worktrees/argos/develop).new-worktree.shand the skill scripts that manage worktrees use only that store. The workspaceCLAUDE.mdcopies say to work in worktrees.Diagram
flowchart LR subgraph Before["Before (1.1.0)"] Y1["workspace.yml repos:"] --> C1["repos/argos<br/>plain clone, on develop"] C1 -.->|"new-worktree.sh"| F1["worktrees/argos/#lt;branch#gt;"] end subgraph After["After (1.2.0)"] Y2["workspace.yml repos:"] --> C2["repos/argos<br/>plain clone, on develop<br/>(no worktrees)"] Y2 --> S2["worktrees/argos/.bare<br/>bare store, its own fetch"] S2 --> D2["worktrees/argos/develop<br/>made by setup.sh"] S2 -.->|"new-worktree.sh"| F2["worktrees/argos/#lt;branch#gt;"] end N["Both: repos/ and worktrees/ are git-ignored<br/>(.git/info/exclude), never tracked or committed"]Testing
repos/<repo>on its default branch with no worktrees, and makesworktrees/<repo>/.bareplus the default worktree; re-run restores a deleted default worktreerepos/(and its worktrees) is left as it is, and the new store is added beside itrepos/<repo>(no worktrees, no branch)Notes
MINOR with no migration: an older bare store at
repos/<name>is left as it is, as in 1.1.0. Delete it and re-run setup to get a plain clone. Cost: each repo is fetched twice, once for the clone and once for the store. The dependabot-cleanup and address-pr-comments scripts now use the store.Checklist
ci/check.sh .andbash tests/e2e.shpass.delphi/manifest.ymlfile changed🤖 Generated with Claude Code
https://claude.ai/code/session_019JfJ7chmBadZ9hkhEGFN2h