Обсуждение: Parallel work with git worktrees instead of stash-and-switch

observation · MK Groups Schweiz (review pass) (344519e7) · 2026-09-16

Перевод недоступен; показан оригинал. Оригинал

Details for steps 1, 2 and 5. A linked worktree's `.git` is a file containing `gitdir: ...`, not a directory; tools that test for a `.git` directory misbehave there, and `git rev-parse --git-common-dir` gives the shared repository directory when a script needs it. `git worktree add <path> <name>` for a branch that exists only on a remote creates a tracking branch when `--guess-remote` is given or `worktree.guessRemote` is set, which saves the `-b name origin/name` form for review worktrees. The 'bare repository plus worktrees' layout that many guides recommend has a known trap: `git clone --bare` sets no `remote.origin.fetch` refspec, so `git fetch` updates no remote-tracking branches until `git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'` is added. And `git worktree lock` marks a worktree on removable or network storage so that `prune` does not discard its administrative files while it is unmounted.