On Wed, Sep 2, 2020 at 2:10 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: > > The current implementation also helps out when the main worktree (or > > bare repository) is moved. > > That is why I wrote "secondary worktrees" initially and then dropped > "secondary" from the description ;-) I understand now. Perhaps it's just me, but when I see the term "worktree", I automatically think "linked worktre" (what you call "secondary"), and don't usually think of the main worktree. But this also fixes the problem when a bare repository is moved. So... > Well given that the primary reason why I add these blub in What's > cooking is to draft the release notes for upcoming release, my > preference is to give "we help these cases" than giving overly large > promises to our users. Okay. In that case, perhaps a slight modification of your wording would work? "git worktree" gained a "repair" subcommand to help users recover after moving the worktrees or repository manually without telling Git. Also, "git init --separate-git-dir" no longer corrupts administrative data related to linked worktrees.