Merge branch 'master' into useGitStatusCache

GitUtils.ps1

@@ -149,7 +149,10 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) {
             } else {
                 dbg 'Getting status' $sw
                 $status = git -c color.status=false status --short --branch 2>$null
-                $stashCount = $null | git stash list 2>$null | measure-object | select -expand Count
+                if($settings.EnableStashStatus) {
+                    dbg 'Getting stash count' $sw
+                    $stashCount = $null | git stash list 2>$null | measure-object | select -expand Count
+                }
 
                 dbg 'Parsing status' $sw
                 $status | foreach {
@@ -276,7 +279,7 @@ function Set-TempEnv($key, $value) {
 # is a running agent.
 function Get-SshAgent() {
     if ($env:GIT_SSH -imatch 'plink') {
-        $pageantPid = Get-Process | Where-Object { $_.Name -eq 'pageant' } | Select -ExpandProperty Id
+        $pageantPid = Get-Process | Where-Object { $_.Name -eq 'pageant' } | Select -ExpandProperty Id -First 1
         if ($null -ne $pageantPid) { return $pageantPid }
     } else {
         $agentPid = $Env:SSH_AGENT_PID
@@ -335,7 +338,7 @@ function Start-SshAgent([switch]$Quiet) {
         $pageant = Get-Command pageant -TotalCount 1 -Erroraction SilentlyContinue
         $pageant = if ($pageant) {$pageant} else {Guess-Pageant}
         if (!$pageant) { Write-Warning "Could not find Pageant."; return }
-        & $pageant
+        Start-Process -NoNewWindow $pageant
     } else {
         $sshAgent = Get-Command ssh-agent -TotalCount 1 -ErrorAction SilentlyContinue
         $sshAgent = if ($sshAgent) {$sshAgent} else {Guess-Ssh('ssh-agent')}