From 7344b41f474462fcc457230d1d4ba30b67850d2b Mon Sep 17 00:00:00 2001 From: Matt Irvine Date: Wed, 6 Mar 2019 18:56:04 -0800 Subject: [PATCH] Fix bug where git extension fails in packaged builds (#4318) --- extensions/git/src/main.ts | 46 ++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts index 74628c3306..fdc0f87416 100644 --- a/extensions/git/src/main.ts +++ b/extensions/git/src/main.ts @@ -172,32 +172,30 @@ async function checkGitVersion(_info: IGit): Promise { return; - /* - const config = workspace.getConfiguration('git'); - const shouldIgnore = config.get('ignoreLegacyWarning') === true; + // const config = workspace.getConfiguration('git'); + // const shouldIgnore = config.get('ignoreLegacyWarning') === true; - if (shouldIgnore) { - return; - } + // if (shouldIgnore) { + // return; + // } - if (!/^[01]/.test(info.version)) { - return; - } + // if (!/^[01]/.test(info.version)) { + // return; + // } - const update = localize('updateGit', "Update Git"); - const neverShowAgain = localize('neverShowAgain', "Don't Show Again"); + // const update = localize('updateGit', "Update Git"); + // const neverShowAgain = localize('neverShowAgain', "Don't Show Again"); - const choice = await window.showWarningMessage( - localize('git20', "You seem to have git {0} installed. Code works best with git >= 2", info.version), - update, - neverShowAgain - ); + // const choice = await window.showWarningMessage( + // localize('git20', "You seem to have git {0} installed. Code works best with git >= 2", info.version), + // update, + // neverShowAgain + // ); - if (choice === update) { - commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/')); - } else if (choice === neverShowAgain) { - await config.update('ignoreLegacyWarning', true, true); - } - // {{SQL CARBON EDIT}} - */ -} + // if (choice === update) { + // commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/')); + // } else if (choice === neverShowAgain) { + // await config.update('ignoreLegacyWarning', true, true); + // } + // {{SQL CARBON EDIT}} - End +} \ No newline at end of file