From f6fa558fa4cf55d3686f72a302ca309708afe68a Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Mon, 22 Dec 2025 13:46:59 +0000 Subject: [PATCH] Git - fix issue with active repositry state being stale (#2659) --- extensions/copilot/src/platform/git/vscode/gitServiceImpl.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/copilot/src/platform/git/vscode/gitServiceImpl.ts b/extensions/copilot/src/platform/git/vscode/gitServiceImpl.ts index 54eac72477b..75b3a605391 100644 --- a/extensions/copilot/src/platform/git/vscode/gitServiceImpl.ts +++ b/extensions/copilot/src/platform/git/vscode/gitServiceImpl.ts @@ -14,6 +14,7 @@ import { Emitter, Event } from '../../../util/vs/base/common/event'; import { Disposable } from '../../../util/vs/base/common/lifecycle'; import { autorun, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, waitForState } from '../../../util/vs/base/common/observableInternal'; import * as path from '../../../util/vs/base/common/path'; +import { isEqual } from '../../../util/vs/base/common/resources'; import { URI } from '../../../util/vs/base/common/uri'; import { ILogService } from '../../log/common/logService'; import { IGitExtensionService } from '../common/gitExtensionService'; @@ -284,8 +285,9 @@ export class GitServiceImpl extends Disposable implements IGitService { this._register(autorun(reader => { onDidChangeStateSignal.read(reader); const selected = selectedObs.read(reader); + const activeRepository = this.activeRepository.get(); - if (activeRepository && !selected) { + if (activeRepository && !selected && !isEqual(activeRepository.rootUri, repository.rootUri)) { return; }