From 6d2b60bb117ec3533a879b09bd835ecf8136bfa0 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 19 Feb 2018 02:47:12 -0500 Subject: [PATCH] Adds git.path lookup to git search --- CHANGELOG.md | 3 +++ src/extension.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edfd63e..34e24ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds the *Clear Results* (`gitlen.resultsExplorer.clearResultsNode`) command to the *GitLens Results* view inline for results nodes - Adds *Push to Commit (via Terminal)* (`gitlens.explorers.terminalPushCommit`) command to commit nodes on the current branch in the *GitLens* explorer +## Changed +- Uses vscode's `git.path` setting when searching for the git executable + ### Fixed - Fixes [#276](https://github.com/eamodio/vscode-gitlens/issues/276) - Lookup for branches without upstreams fails - Fixes [#274](https://github.com/eamodio/vscode-gitlens/issues/274) - TextEditor is closed/disposed occurs when this extension is enabled diff --git a/src/extension.ts b/src/extension.ts index d567531..09ebcb3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -35,7 +35,7 @@ export async function activate(context: ExtensionContext) { const cfg = configuration.get(); try { - await GitService.initialize(cfg.advanced.git); + await GitService.initialize(cfg.advanced.git || workspace.getConfiguration('git').get('path')); } catch (ex) { Logger.error(ex, `GitLens(v${gitlensVersion}).activate`);