Skip to content

feat(git): enhance repository matching logic for workspace folders #8

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

Merged
mqyang56 merged 1 commit into from
Feb 26, 2026
Merged

feat(git): enhance repository matching logic for workspace folders #8

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
16 changes: 16 additions & 0 deletions src/git/gitService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ interface GitAPI {
}

interface Repository {
rootUri: vscode.Uri;
inputBox: { value: string };
diff(cached: boolean): Promise<string>;
state: {
Expand All @@ -34,6 +35,21 @@ export class GitService {
if (api.repositories.length === 0) {
throw new Error("No git repository found in workspace");
}

// When submodules are present, api.repositories contains both the root repo
// and each submodule as separate entries. Find the one whose rootUri matches
// the current workspace folder to avoid operating on a submodule repo.
const workspaceFolders = vscode.workspace.workspaceFolders;
if (workspaceFolders && workspaceFolders.length > 0) {
const workspaceRoot = workspaceFolders[0].uri.fsPath;
const matched = api.repositories.find(
(r) => r.rootUri.fsPath === workspaceRoot
);
if (matched) {
return matched;
}
}

return api.repositories[0];
}

Expand Down