Skip to content

Background - return worktree changes for all repositories #3365

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
lszomoru merged 1 commit into from
Feb 2, 2026
Merged

Background - return worktree changes for all repositories #3365

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
20 changes: 10 additions & 10 deletions src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ILogService } from '../../../platform/log/common/logService';
import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
import { Disposable } from '../../../util/vs/base/common/lifecycle';
import * as path from '../../../util/vs/base/common/path';
import { basename, isEqual } from '../../../util/vs/base/common/resources';
import { basename } from '../../../util/vs/base/common/resources';
import { ChatSessionWorktreeData, ChatSessionWorktreeFile, ChatSessionWorktreeProperties, IChatSessionWorktreeService } from '../common/chatSessionWorktreeService';

const CHAT_SESSION_WORKTREE_MEMENTO_KEY = 'github.copilot.cli.sessionWorktrees';
Expand Down Expand Up @@ -242,15 +242,6 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
// so we can get them from the main repository or discovered worktree.
await this.gitService.initialize();

// TODO@lszomoru: Remove this change to support welcome view
// Check whether the worktree belongs to any of the discovered repositories
const repository = this.gitService.repositories
.find(r => r.worktrees.some(w => isEqual(vscode.Uri.file(w.path), worktreePath)));

if (!repository) {
return undefined;
}

if (worktreeProperties.autoCommit === false) {
// These changes are staged in the worktree but not yet committed. Since the
// changes are not committed, we need to get them from the worktree repository
Expand Down Expand Up @@ -293,6 +284,15 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
return changes;
}

// Open the main repository that contains the worktree. We have to open
// the repository so that we can run do `git diff` against the repository
// to get the committed changes in the worktree branch.
const repository = await this.gitService.getRepository(vscode.Uri.file(worktreeProperties.repositoryPath));

if (!repository) {
return undefined;
}

// These changes are committed in the worktree branch but since they are
// committed we can get the changes from the main repository and we do
// not need to open the worktree repository.
Expand Down
Loading