Copilot CLI - adopt new git extension API to improve applying a patch#2725
Merged
Copilot CLI - adopt new git extension API to improve applying a patch#2725
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adopts a new Git extension API (diffBetweenPatch) to improve the process of applying patches from worktrees. The change simplifies the existing code by replacing a multi-step approach (getting diff stats then fetching individual patches) with a single API call that returns the complete patch directly.
Key changes:
- Adds
diffBetweenPatchmethod to the Git extension API type definitions - Updates
IGitServiceinterface and all implementations to make thepathparameter optional - Refactors
applyWorktreeChangesto use the new API, eliminating the need for multiple diff calls and array coalescing
Reviewed changes
Copilot reviewed 5 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/platform/git/vscode/git.d.ts | Adds diffBetweenPatch method signature to Repository interface |
| src/platform/git/common/gitService.ts | Updates IGitService interface to make path parameter optional in diffBetweenPatch |
| src/platform/git/vscode/gitServiceImpl.ts | Updates implementation to call the new diffBetweenPatch API method (previously incorrectly called diffBetween) |
| src/platform/test/node/simulationWorkspaceServices.ts | Updates test mock to match new signature with optional path parameter |
| src/platform/ignore/node/test/mockGitService.ts | Updates mock implementation to match new signature with optional path parameter |
| src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts | Simplifies patch generation by using single diffBetweenPatch call instead of multiple calls; removes unused coalesce import |
src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts
Show resolved
Hide resolved
Tyriar
approved these changes
Jan 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes microsoft/vscode#286066