Merge pull request #743 from dahlbyk/rkeithhill/fix-expandparamvalues…

…-scriptblock-invoke Fix git restore scriptblock used by expandParamValues
dahlbyk · Mar 14, 2020 · f69efd9 · f69efd9
2 parents bce6e48 + 38e04fe
commit f69efd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/GitParamTabExpansion.ps1 b/src/GitParamTabExpansion.ps1
@@ -181,8 +181,8 @@ $gitParamValues = @{
         conflict = 'merge diff3'
         source = {
             param($ref)
-            gitBranches $matches['ref'] $true
-            gitTags $matches['ref']
+            gitBranches $ref $true
+            gitTags $ref
         }
     }
     revert = @{

diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -263,7 +263,7 @@ function script:expandParamValues($cmd, $param, $filter) {
     $paramValues = $gitParamValues[$cmd][$param]
 
     $completions = if ($paramValues -is [scriptblock]) {
-        & $paramValues $filter | Where-Object { $_ -like "$filter*" }
+        & $paramValues $filter
     }
     else {
         $paramValues.Trim() -split ' ' | Where-Object { $_ -like "$filter*" } | Sort-Object