using-git-worktrees

Using Git Worktrees

Overview

Ensure work happens in an isolated workspace. Prefer your platform's native worktree tools. Fall back to manual git worktrees only when no native tool is available.

Announce at start: "I'm using the using-git-worktrees skill to set up an isolated workspace."

Step 0: Detect Existing Isolation

Before creating anything, check if you are already in an isolated workspace:

GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)

Submodule guard: verify you are not in a submodule before concluding "already in a worktree":

git rev-parse --show-superproject-working-tree 2>/dev/null

• If GIT_DIR != GIT_COMMON (and not a submodule): already in a linked worktree. Skip to Step 3.
• If GIT_DIR == GIT_COMMON: normal repo. Ask for consent before creating a worktree.

Step 1: Create Isolated Workspace

Try in order:

1a. Native worktree tool (preferred): If a tool like EnterWorktree, WorktreeCreate, or /worktree command is available, use it and skip to Step 3. Never fight the harness.

1b. Git worktree fallback (only if no native tool):

Directory priority:

1. Declared user preference in instructions
2. Existing .worktrees/ or worktrees/ at project root
3. Existing ~/.config/superpowers/worktrees/<project>/
4. Default: .worktrees/ at project root

Safety check for project-local directories:

git check-ignore -q .worktrees 2>/dev/null || git check-ignore -q worktrees 2>/dev/null

If NOT ignored: add to .gitignore, commit, then proceed.

git worktree add "$path" -b "$BRANCH_NAME"
cd "$path"

Step 2: Project Setup

if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f pyproject.toml ]; then uv sync; fi
if [ -f package.json ]; then npm install; fi

Step 3: Tessera Context Rebuild