From 3e13ee89d946ddd3e0f592467d4dfa2325e01ae1 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Mon, 2 Jan 2017 13:22:33 -0600 Subject: [PATCH] Add cache responses to existing lists --- GitUtils.ps1 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/GitUtils.ps1 b/GitUtils.ps1 index d9487246f..6672d1ac9 100644 --- a/GitUtils.ps1 +++ b/GitUtils.ps1 @@ -153,17 +153,17 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) { $cacheResponse = Get-GitStatusFromCache dbg 'Parsing status' $sw - $indexAdded = $cacheResponse.IndexAdded - $indexModified = $cacheResponse.IndexModified - $cacheResponse.IndexRenamed | foreach { $indexModified += $_.Old } - $indexDeleted = $cacheResponse.IndexDeleted - $indexUnmerged = $cacheResponse.Conflicted - - $filesAdded = $cacheResponse.WorkingAdded - $filesModified = $cacheResponse.WorkingModified - $cacheResponse.WorkingRenamed | foreach { $filesModified += $_.Old } - $filesDeleted = $cacheResponse.WorkingDeleted - $filesUnmerged = $cacheResponse.Conflicted + $indexAdded.AddRange([string[]]$cacheResponse.IndexAdded) + $indexModified.AddRange([string[]]$cacheResponse.IndexModified) + $indexModified.AddRange([string[]]@($cacheResponse.IndexRenamed | Select-Object -ExpandProperty Old)) + $indexDeleted.AddRange([string[]]$cacheResponse.IndexDeleted) + $indexUnmerged.AddRange([string[]]$cacheResponse.Conflicted) + + $filesAdded.AddRange([string[]]$cacheResponse.WorkingAdded) + $filesModified.AddRange([string[]]$cacheResponse.WorkingModified) + $filesModified.AddRange([string[]]@($cacheResponse.WorkingRenamed | Select-Object -ExpandProperty Old)) + $filesDeleted.AddRange([string[]]$cacheResponse.WorkingDeleted) + $filesUnmerged.AddRange([string[]]$cacheResponse.Conflicted) $branch = $cacheResponse.Branch $upstream = $cacheResponse.Upstream