From 19df280c7f7cf73d9bafcde82a9e93b14026cfc2 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 9 Jul 2018 10:37:51 +0200 Subject: [PATCH] fixes #53849 --- extensions/git/src/git.ts | 4 ++-- extensions/git/src/repository.ts | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index cea9edd799a..a6d79456ed2 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -795,10 +795,10 @@ export class Repository { return parseLsFiles(stdout); } - async getGitRelativePath(treeish: string, relativePath: string): Promise { + async getGitRelativePath(ref: string, relativePath: string): Promise { const relativePathLowercase = relativePath.toLowerCase(); const dirname = path.posix.dirname(relativePath) + '/'; - const elements: { file: string; }[] = treeish ? await this.lstree(treeish, dirname) : await this.lsfiles(dirname); + const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname); const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0]; if (!element) { diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index ece6ef8fb37..b3af0698312 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -882,10 +882,6 @@ export class Repository implements Disposable { const defaultEncoding = configFiles.get('encoding'); const autoGuessEncoding = configFiles.get('autoGuessEncoding'); - if (ref === '') { - ref = 'HEAD'; - } - try { return await this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding); } catch (err) { -- GitLab