Skip to content

Harden the worktree recipe with --no-track, and name .git/config in the shared-namespace inventory #13403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
os-zhuang merged 1 commit into from
Aug 30, 2026
+4 −4
Merged

Harden the worktree recipe with --no-track, and name .git/config in the shared-namespace inventory #13403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ localStorage / auth gotchas.
11. **Worktree-first — never edit on the shared `main` checkout.** This repo is edited by **multiple agents at once**;
the shared tree has its HEAD switched and reset *under you*, silently clobbering uncommitted work — a feature
branch on the *shared* checkout is **not** enough (it still gets switched under you). Before your **first file
edit**, be in a dedicated worktree on a feature branch: `git fetch origin main &&
git worktree add ../objectstack-<task> -b <branch> origin/main && cd ../objectstack-<task> && pnpm install`. Two
edit**, be in a dedicated worktree on a feature branch: `git fetch origin main && git worktree add --no-track
../objectstack-<task> -b <branch> origin/main && cd ../objectstack-<task> && pnpm install`. Two
PreToolUse hooks **enforce** this — `.claude/hooks/guard-main-checkout.sh` blocks `Edit`/`Write`/`NotebookEdit`,
and `.claude/hooks/guard-main-checkout-bash.sh` blocks the identical write arriving through **Bash** (`>`/`>>`
redirection, `sed -i`, `perl -i`, `tee`, `cp`, `mv`, `rm`, `touch`) — and both check the **target file's own
Expand Down Expand Up @@ -394,7 +394,7 @@ git worktree add ../objectstack-<task>-cmp <ref> # a second tree to compa

**⛔ The stash is one CASE — a worktree isolates your checkout and exactly four ref
namespaces (`HEAD`, `refs/bisect`, `refs/worktree`, `refs/rewritten`) and NOTHING else:**
not the object store, not the config, not any other ref, so "worktrees isolate refs,
not the object store, not `.git/config`, not any other ref, so "worktrees isolate refs,
except stash" is exactly backwards. **`refs/remotes/*` is shared** — a sibling's fetch
advances **your** `origin/main` (measured next door: three moves in ten minutes), so
`git checkout origin/main -- <paths>` restores wherever that ref points **now**, possibly
Expand Down
2 changes: 1 addition & 1 deletion CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ shared checkout is NOT enough** — it still gets switched under you. You MUST b
**dedicated per-task worktree**:

```
git fetch origin main && git worktree add ../<repo>-<task> -b <branch> origin/main && cd ../<repo>-<task> && pnpm install
git fetch origin main && git worktree add --no-track ../<repo>-<task> -b <branch> origin/main && cd ../<repo>-<task> && pnpm install
```

Then make all edits there. This applies **per repo**: if a task spans `framework` and
Expand Down
Loading