Skip to content

git: discover worktrees when opening a worktree directory (#264209) #309321

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

Open
marcelsafin wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

git: discover worktrees when opening a worktree directory (#264209) #309321

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
14 changes: 7 additions & 7 deletions extensions/git/src/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,17 +807,17 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
return;
}

if (repository.kind === 'worktree') {
this.logger.trace('[Model][open] Automatic detection of git worktrees is not skipped.');
return;
}
// Discover additional worktrees for the repository, but do not
// include the currently opened repository itself.
const candidateWorktrees = repository.worktrees
.filter(w => !pathEquals(w.path, repository.root));

if (repository.worktrees.length > worktreesLimit) {
window.showWarningMessage(l10n.t('The "{0}" repository has {1} worktrees which won\'t be opened automatically. You can still open each one individually by opening a file within.', path.basename(repository.root), repository.worktrees.length));
if (candidateWorktrees.length > worktreesLimit) {
window.showWarningMessage(l10n.t('The "{0}" repository has {1} worktrees which won\'t be opened automatically. You can still open each one individually by opening a file within.', path.basename(repository.root), candidateWorktrees.length - worktreesLimit));
statusListener.dispose();
}

repository.worktrees
candidateWorktrees
.slice(0, worktreesLimit)
.forEach(w => {
this.logger.trace(`[Model][open] Opening worktree: '${w.path}'`);
Expand Down
Loading