Minor fixes during peer review

Author: mdekrey

git-release.ps1

@@ -39,7 +39,7 @@ if (-not $force) {
     Assert-Diagnostics $diagnostics
 }
 
-# $toRemove = (git show-upstream $source -recurse) without ($target, git show-upstream $target -recurse)
+# $toRemove = (git show-upstream $source -recurse) without ($target, git show-upstream $target -recurse, $preserve)
 $sourceUpstream = Invoke-LocalAction @commonParams @{
     type = 'get-upstream'
     parameters = @{ target = $source; recurse = $true }
@@ -52,8 +52,8 @@ $targetUpstream = Invoke-LocalAction @commonParams @{
 }
 Assert-Diagnostics $diagnostics
 
-$keep = @($target) + $targetUpstream
-[string[]]$toRemove = (@($source) + $sourceUpstream) | Where-Object { $_ -notin $keep -and $_ -notin $preserve }
+[string[]]$keep = @($target) + $targetUpstream + $preserve
+[string[]]$toRemove = (@($source) + $sourceUpstream) | Where-Object { $_ -notin $keep }
 
 # Assert all branches removed are up-to-date, unless $force is set
 if (-not $force) {

git-release.tests.ps1

@@ -82,7 +82,7 @@ Describe 'git-release' {
             $fw.assertDiagnosticOutput | Should -Contain 'ERR:  The branch feature/FOO-123 has changes that are not in rc/2022-07-14'
         }
 
-        It 'allows forced removal even if an intermediate branches were not fully released' {
+        It 'allows forced removal even if a intermediate branches were not fully released' {
             Initialize-AllUpstreamBranches @{
                 'rc/2022-07-14' = @("feature/FOO-123","feature/XYZ-1-services")
                 'feature/FOO-123' = @('main')