Skip to content

Stop Get-Process from adding exceptions to $Error when checking if pageant / ssh-agent aren't running #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dahlbyk merged 4 commits into from
Nov 13, 2014
Merged

Stop Get-Process from adding exceptions to $Error when checking if pageant / ssh-agent aren't running #162

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22d1fc4
Stop Get-Process from adding exceptions to $Error
paulmarsy Nov 9, 2014
45137de
Revert "Stop Get-Process from adding exceptions to $Error"
paulmarsy Nov 9, 2014
687cce6
Modifying the identification of the pageant and ssh-agent processes
paulmarsy Nov 9, 2014
306eed9
Removing the unneeded selection of ssh-agent's PID
paulmarsy Nov 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions GitUtils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down