diff --git a/extensions/git/src/actionButton.ts b/extensions/git/src/actionButton.ts index 0c94636fff2..63eefb1de02 100644 --- a/extensions/git/src/actionButton.ts +++ b/extensions/git/src/actionButton.ts @@ -262,7 +262,6 @@ export class ActionButton { const isCommitInProgress = this.repository.operations.isRunning(OperationKind.Commit) || this.repository.operations.isRunning(OperationKind.PostCommitCommand) || - this.repository.operations.isRunning(OperationKind.MergeContinue) || this.repository.operations.isRunning(OperationKind.RebaseContinue); const isSyncInProgress = diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 2944f1d2f17..2f0d11bd488 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -1896,16 +1896,6 @@ export class Repository { await this.exec(['merge', '--abort']); } - async mergeContinue(): Promise { - const args = ['merge', '--continue']; - - try { - await this.exec(args, { env: { GIT_EDITOR: 'true' } }); - } catch (commitErr) { - await this.handleCommitError(commitErr); - } - } - async tag(options: { name: string; message?: string; ref?: string }): Promise { let args = ['tag']; diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts index 4946c70d966..d8b2773f1c2 100644 --- a/extensions/git/src/operation.ts +++ b/extensions/git/src/operation.ts @@ -39,7 +39,6 @@ export const enum OperationKind { Merge = 'Merge', MergeAbort = 'MergeAbort', MergeBase = 'MergeBase', - MergeContinue = 'MergeContinue', Move = 'Move', PostCommitCommand = 'PostCommitCommand', Pull = 'Pull', @@ -70,10 +69,10 @@ export type Operation = AddOperation | ApplyOperation | BlameOperation | BranchO DeleteRefOperation | DeleteRemoteRefOperation | DeleteTagOperation | DiffOperation | FetchOperation | FindTrackingBranchesOperation | GetBranchOperation | GetBranchesOperation | GetCommitTemplateOperation | GetObjectDetailsOperation | GetObjectFilesOperation | GetRefsOperation | GetRemoteRefsOperation | HashObjectOperation | IgnoreOperation | LogOperation | LogFileOperation | MergeOperation | MergeAbortOperation | - MergeBaseOperation | MergeContinueOperation | MoveOperation | PostCommitCommandOperation | PullOperation | PushOperation | RemoteOperation | - RenameBranchOperation | RemoveOperation | ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RefreshOperation | - RevertFilesOperation | RevListOperation | RevParseOperation | SetBranchUpstreamOperation | ShowOperation | StageOperation | StatusOperation | - StashOperation | SubmoduleUpdateOperation | SyncOperation | TagOperation; + MergeBaseOperation | MoveOperation | PostCommitCommandOperation | PullOperation | PushOperation | RemoteOperation | RenameBranchOperation | + RemoveOperation | ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RefreshOperation | RevertFilesOperation | + RevListOperation | RevParseOperation | SetBranchUpstreamOperation | ShowOperation | StageOperation | StatusOperation | StashOperation | + SubmoduleUpdateOperation | SyncOperation | TagOperation; type BaseOperation = { kind: OperationKind; blocking: boolean; readOnly: boolean; remote: boolean; retry: boolean; showProgress: boolean }; export type AddOperation = BaseOperation & { kind: OperationKind.Add }; @@ -108,7 +107,6 @@ export type LogFileOperation = BaseOperation & { kind: OperationKind.LogFile }; export type MergeOperation = BaseOperation & { kind: OperationKind.Merge }; export type MergeAbortOperation = BaseOperation & { kind: OperationKind.MergeAbort }; export type MergeBaseOperation = BaseOperation & { kind: OperationKind.MergeBase }; -export type MergeContinueOperation = BaseOperation & { kind: OperationKind.MergeContinue }; export type MoveOperation = BaseOperation & { kind: OperationKind.Move }; export type PostCommitCommandOperation = BaseOperation & { kind: OperationKind.PostCommitCommand }; export type PullOperation = BaseOperation & { kind: OperationKind.Pull }; @@ -166,7 +164,6 @@ export const Operation = { Merge: { kind: OperationKind.Merge, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeOperation, MergeAbort: { kind: OperationKind.MergeAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation, MergeBase: { kind: OperationKind.MergeBase, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as MergeBaseOperation, - MergeContinue: { kind: OperationKind.MergeContinue, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation, Move: { kind: OperationKind.Move, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MoveOperation, PostCommitCommand: { kind: OperationKind.PostCommitCommand, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as PostCommitCommandOperation, Pull: { kind: OperationKind.Pull, blocking: true, readOnly: false, remote: true, retry: true, showProgress: true } as PullOperation, diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index 813b94e8ff0..ca8974f2fc5 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -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 () => {