Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - add option to restore staged changes when aplying/popping a stash (#278556)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-11-20 11:13:37 +00:00
committed by GitHub
parent 4c798ea2c6
commit 9c36e3505a
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/git/src/git.ts
View File

@@ -2461,13 +2461,19 @@ export class Repository {
}
}
async popStash(index?: number): Promise<void> {
async popStash(index?: number, options?: { reinstateStagedChanges?: boolean }): Promise<void> {
const args = ['stash', 'pop'];
if (options?.reinstateStagedChanges) {
args.push('--index');
}
await this.popOrApplyStash(args, index);
}
async applyStash(index?: number): Promise<void> {
async applyStash(index?: number, options?: { reinstateStagedChanges?: boolean }): Promise<void> {
const args = ['stash', 'apply'];
if (options?.reinstateStagedChanges) {
args.push('--index');
}
await this.popOrApplyStash(args, index);
}