From eee9f2612529d7c6fed47bfa0b54c48161819cb7 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 10 Nov 2016 15:43:53 +0100 Subject: [PATCH] lint: remove semver dependency from gitServices #15293 --- src/vs/workbench/parts/git/browser/gitServices.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/git/browser/gitServices.ts b/src/vs/workbench/parts/git/browser/gitServices.ts index b141889c475..af7ebf5ee61 100644 --- a/src/vs/workbench/parts/git/browser/gitServices.ts +++ b/src/vs/workbench/parts/git/browser/gitServices.ts @@ -35,7 +35,6 @@ import { IMessageService, CloseAction } from 'vs/platform/message/common/message import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import URI from 'vs/base/common/uri'; -import * as semver from 'semver'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import Event from 'vs/base/common/event'; import { domEvent } from 'vs/base/browser/event'; @@ -472,11 +471,10 @@ export class GitService extends EventEmitter } return this.raw.getVersion().then(version => { - version = version || ''; - version = version.replace(/^(\d+\.\d+\.\d+).*$/, '$1'); - version = semver.valid(version); + const match = /^(\d+)\.\d+\.\d+/.exec(version || ''); + const major = match && parseInt(match[1]); - if (version && semver.satisfies(version, '<2.0.0')) { + if (major && major < 2) { messageService.show(severity.Warning, { message: localize('updateGit', "You seem to have git {0} installed. Code works best with git >=2.0.0.", version), actions: [ -- GitLab