Skip to content

git: remove repo from SCM when workspace folder is removed #327124

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
Shreyash (Iitian001) wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −5
Open

git: remove repo from SCM when workspace folder is removed #327124

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89e13d8
git: remove repo from SCM when workspace folder is removed
Iitian001 Jul 23, 2026
95dd2b1
fix(git): preserve parent repositories and manual close state on fold…
Iitian001 Oct 16, 2026
f065182
git: tidy workspace folder removal comments
Iitian001 Nov 15, 2026
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
21 changes: 16 additions & 5 deletions extensions/git/src/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,12 +477,23 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
.filter(repository => !!repository) as Repository[];

const activeRepositories = new Set<Repository>(activeRepositoriesList);
const openRepositoriesToDispose = removed
.map(folder => this.getOpenRepository(folder.uri))
.filter(r => !!r)
.filter(r => !activeRepositories.has(r!.repository))
.filter(r => !(workspace.workspaceFolders || []).some(f => isDescendant(f.uri.fsPath, r!.repository.root))) as OpenRepository[];

// A repository may be rooted at, inside, or ABOVE a workspace folder
// (for example, when git.openRepositoryInParentFolders is enabled).
const overlapsFolder = (folderPath: string, repositoryRoot: string): boolean =>
pathEquals(folderPath, repositoryRoot) ||
isDescendant(folderPath, repositoryRoot) ||
isDescendant(repositoryRoot, folderPath);

const remainingFolders = workspace.workspaceFolders || [];
const openRepositoriesToDispose = this.openRepositories
.filter(r => removed.some(folder => overlapsFolder(folder.uri.fsPath, r.repository.root)))
.filter(r => !activeRepositories.has(r.repository))
// Keep a parent repo open while any remaining child workspace folder uses it.
.filter(r => !remainingFolders.some(folder => overlapsFolder(folder.uri.fsPath, r.repository.root)));

// Manually closed repository markers are intentionally kept so that the
// repository scan below does not reopen a repository the user closed.
openRepositoriesToDispose.forEach(r => r.dispose());
this.logger.trace(`[Model][onDidChangeWorkspaceFolders] Workspace folders: [${possibleRepositoryFolders.map(p => p.uri.fsPath).join(', ')}]`);
await Promise.all(possibleRepositoryFolders.map(p => this.openRepository(p.uri.fsPath)));
Expand Down