From 88e4bd7ad06ec591a7c52c8e6bc5890f3ffd5701 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 31 Aug 2017 16:33:32 +0200 Subject: [PATCH] fixes #33309 --- extensions/git/src/repository.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index a0ebb292a51..af4361dfa7d 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -376,10 +376,10 @@ export class Repository implements Disposable { const onWorkspaceChange = anyEvent(fsWatcher.onDidChange, fsWatcher.onDidCreate, fsWatcher.onDidDelete); const onRepositoryChange = filterEvent(onWorkspaceChange, uri => !/^\.\./.test(path.relative(repository.root, uri.fsPath))); - onRepositoryChange(this.onFSChange, this, this.disposables); + const onRelevantRepositoryChange = filterEvent(onRepositoryChange, uri => !/\/\.git\/index\.lock$/.test(uri.path)); + onRelevantRepositoryChange(this.onFSChange, this, this.disposables); - const onGitChange = filterEvent(onRepositoryChange, uri => /\/\.git\//.test(uri.path)); - const onRelevantGitChange = filterEvent(onGitChange, uri => !/\/\.git\/index\.lock$/.test(uri.path)); + const onRelevantGitChange = filterEvent(onRelevantRepositoryChange, uri => /\/\.git\//.test(uri.path)); onRelevantGitChange(this._onDidChangeRepository.fire, this._onDidChangeRepository, this.disposables); const label = `${path.basename(repository.root)} (Git)`; -- GitLab