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

Git - fix regression related to editing the merge commit message (#241061)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-02-18 10:31:00 +01:00
committed by GitHub
parent 80b20f33e7
commit 60240d261a
4 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/git/src/repository.ts
View File

@@ -1294,20 +1294,7 @@ export class Repository implements Disposable {
const workingGroupResources = opts.all && opts.all !== 'tracked' ?
[...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : [];
if (this.mergeInProgress) {
await this.run(
Operation.MergeContinue,
async () => {
if (opts.all) {
const addOpts = opts.all === 'tracked' ? { update: true } : {};
await this.repository.add([], addOpts);
}
await this.repository.mergeContinue();
await this.commitOperationCleanup(message, indexResources, workingGroupResources);
},
() => this.commitOperationGetOptimisticResourceGroups(opts));
} else if (this.rebaseCommit) {
if (this.rebaseCommit) {
await this.run(
Operation.RebaseContinue,
async () => {