Merge pull request #162 from paulmarsy/master

Stop Get-Process from adding exceptions to $Error when checking if pageant / ssh-agent aren't running
dahlbyk · Nov 13, 2014 · 869d4c5 · 869d4c5 · chaki27 · Jan 9, 2015
2 parents 9d95ed5 + 306eed9
commit 869d4c5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/GitUtils.ps1 b/GitUtils.ps1
@@ -244,13 +244,13 @@ function Set-TempEnv($key, $value) {
 # is a running agent.
 function Get-SshAgent() {
     if ($env:GIT_SSH -imatch 'plink') {
-        $pageantPid = Get-Process pageant -ErrorAction SilentlyContinue | Select -ExpandProperty Id
-        if ($pageantPid) { return $pageantPid }
+        $pageantPid = Get-Process | Where-Object { $_.Name -eq 'pageant' } | Select -ExpandProperty Id
+        if ($null -ne $pageantPid) { return $pageantPid }
     } else {
         $agentPid = $Env:SSH_AGENT_PID
         if ($agentPid) {
-            $sshAgentProcess = Get-Process -Id $agentPid -ErrorAction SilentlyContinue
-            if ($sshAgentProcess -and ($sshAgentProcess.Name -eq 'ssh-agent')) {
+            $sshAgentProcess = Get-Process | Where-Object { $_.Id -eq $agentPid -and $_.Name -eq 'ssh-agent' }
+            if ($null -ne $sshAgentProcess) {
                 return $agentPid
             } else {
                 setenv 'SSH_AGENT_PID', $null