From 4297ff8195cfabb0f96aefd122a6e88cb6a080bb Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Fri, 5 Nov 2021 15:53:32 +0100 Subject: [PATCH] Revert fix for #26425 --- extensions/git/package.json | 4 ++-- extensions/git/src/repository.ts | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/extensions/git/package.json b/extensions/git/package.json index 5a222f76471..a5e84c7b7e1 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -577,7 +577,7 @@ }, { "command": "git.openChange", - "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourcePath in git.changedResources" + "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" }, { "command": "git.stage", @@ -1324,7 +1324,7 @@ { "command": "git.openChange", "group": "navigation", - "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file && resourcePath in git.changedResources" + "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file" }, { "command": "git.stageSelectedRanges", diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index eda029c0998..54f5dc55b57 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -1873,7 +1873,6 @@ export class Repository implements Disposable { this._submodules = submodules!; this.rebaseCommit = rebaseCommit; - const untrackedChanges = scopedConfig.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges'); const index: Resource[] = []; const workingTree: Resource[] = []; @@ -1964,9 +1963,6 @@ export class Repository implements Disposable { // set count badge this.setCountBadge(); - // Update context key with changed resources - commands.executeCommand('setContext', 'git.changedResources', [...merge, ...index, ...workingTree, ...untracked].map(r => r.resourceUri.fsPath.toString())); - this._onDidChangeStatus.fire(); this._sourceControl.commitTemplate = await this.getInputTemplate();