From 004535e0bc6e333a4b50643d627acdab9f8ce9ce Mon Sep 17 00:00:00 2001 From: dgames Date: Sun, 21 Nov 2021 13:40:53 -0500 Subject: [PATCH] remove -all --- CHANGELOG.md | 12 ++++++++++++ vendor/profile.ps1 | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a944d2c..39a08a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,18 @@ ### Adds +- Powershell Git version Discovery - See #2373 for the full proposal. + - Find user installed Git on Path + - If found + - if newer than Cmder embedded Git + - Use it's existing Path config and completely ignore embedded Git. + - Else if Cmder embedded Git exists and is newer + - Match User installed Git path config using Cmder embedded Git folders. + - Else if Cmder embedded Git exists + - Add Cmder embedded Git folders to the path. + - `$env:cmder_root\vendor\git-for-windows\cmd;$env:path` + - `$env:path;$env:cmder_root\vendor\git-for-windows\usr\bin` + - `$env:path;$env:cmder_root\vendor\git-for-windows\mingw64\bin` - Configurable prompt for `cmd.exe` sessions. See `%cmder_root%\config\cmder_prompt_config.lua` - Configurable colors - Option to change `λ` to another character. diff --git a/vendor/profile.ps1 b/vendor/profile.ps1 index ea3df01..1472bc5 100644 --- a/vendor/profile.ps1 +++ b/vendor/profile.ps1 @@ -44,7 +44,7 @@ $gitVersionVendor = (readVersion -gitPath "$ENV:CMDER_ROOT\vendor\git-for-window # write-host "GIT VENDOR: ${gitVersionVendor}" # Get user installed Git Version[s] and Compare with vendored if found. -foreach ($git in (get-command -ErrorAction SilentlyContinue -all 'git')) { +foreach ($git in (get-command -ErrorAction SilentlyContinue 'git')) { # write-host "GIT Path: " + $git.Path $gitDir = Split-Path -Path $git.Path $gitDir = isGitShim -gitPath $gitDir