From 5fdcdcd003c981ed357f3d3a93571a85de37719d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 12 Jun 2021 02:29:38 -0400 Subject: [PATCH] Fixes issue where line blame fails intermittently --- CHANGELOG.md | 1 + src/git/gitService.ts | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 085a0c4..8ae2fac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [#1507](https://github.com/eamodio/vscode-gitlens/issues/1507) - Communicate git error instead of "unable to find git" - Fixes [#1512](https://github.com/eamodio/vscode-gitlens/issues/1512) - Git tag command can add an extra `-m` - Fixes [#1402](https://github.com/eamodio/vscode-gitlens/issues/1402) - File history missing commits from other branches +- Fixes an issue where the current line blame intermittently fails to appear ## [11.4.1] - 2021-04-14 diff --git a/src/git/gitService.ts b/src/git/gitService.ts index e4b4ef9..78d7dc5 100644 --- a/src/git/gitService.ts +++ b/src/git/gitService.ts @@ -3110,9 +3110,11 @@ export class GitService implements Disposable { provider: RichRemoteProvider, options?: { timeout?: number }, ): Promise; - @gate((ref, remoteOrProvider) => { + @gate((ref, remoteOrProvider, options) => { const provider = GitRemote.is(remoteOrProvider) ? remoteOrProvider.provider : remoteOrProvider; - return `${ref}${provider != null ? `|${provider.id}:${provider.domain}/${provider.path}` : ''}`; + return `${ref}${provider != null ? `|${provider.id}:${provider.domain}/${provider.path}` : ''}|${ + options?.timeout + }`; }) @debug({ args: {