Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #53849

Browse Source
This commit is contained in:
Joao Moreno
2018-07-09 10:37:51 +02:00
parent ee0a7a265d
commit 19df280c7f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/src/git.ts
View File

@@ -795,10 +795,10 @@ export class Repository {
return parseLsFiles(stdout);
}
async getGitRelativePath(treeish: string, relativePath: string): Promise<string> {
async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
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) {

4
extensions/git/src/repository.ts
View File

@@ -882,10 +882,6 @@ export class Repository implements Disposable {
const defaultEncoding = configFiles.get<string>('encoding');
const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
if (ref === '') {
ref = 'HEAD';
}
try {
return await this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding);
} catch (err) {