Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 22:12:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

🐛 git: remove lock file checking, replace it with try-catch

Browse Source
This commit is contained in:
Joao Moreno
2017-04-07 11:51:53 +02:00
parent 34c8f1a485
commit dc66fda881
2 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,7 +270,8 @@ export const GitErrorCodes = {
GitNotFound: 'GitNotFound',
CantCreatePipe: 'CantCreatePipe',
CantAccessRemote: 'CantAccessRemote',
RepositoryNotFound: 'RepositoryNotFound'
RepositoryNotFound: 'RepositoryNotFound',
RepositoryIsLocked: 'RepositoryIsLocked'
};
export class Git {
@@ -333,7 +334,9 @@ export class Git {
if (result.exitCode) {
let gitErrorCode: string | undefined = void 0;
if (/Authentication failed/.test(result.stderr)) {
if (/Another git process seems to be running in this repository|If no other git process is currently running/.test(result.stderr)) {
gitErrorCode = GitErrorCodes.RepositoryIsLocked;
} else if (/Authentication failed/.test(result.stderr)) {
gitErrorCode = GitErrorCodes.AuthenticationFailed;
} else if (/Not a git repository/.test(result.stderr)) {
gitErrorCode = GitErrorCodes.NotAGitRepository;