Merge branch 'jk/die-on-bogus-worktree-late'