Fixes existing tab completion if dashed parameter for git (e.g. -p, -…

…P) is used
dahlbyk · Dec 26, 2024 · 5a5cedb · 5a5cedb
1 parent bbc5ac3
commit 5a5cedb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -310,6 +310,12 @@ function Expand-GitCommand($Command) {
 function GitTabExpansionInternal($lastBlock, $GitStatus = $null) {
     $ignoreGitParams = '(?<params>\s+-(?:[aA-zZ0-9]+|-[aA-zZ0-9][aA-zZ0-9-]*)(?:=\S+)?)*'
 
+    # Remove direct git parameters like -p, -P
+    # @ToDo: doesn't work with parameters followed by a value like -C <path>
+    if ($lastBlock -match "\s*(\S+\s)\s*((?:-\S+\s)*)([^-]\S+.*)") {
+        $lastBlock = $matches[1] + $matches[3]
+    }
+
     if ($lastBlock -match "^$(Get-AliasPattern git) (?<cmd>\S+)(?<args> .*)$") {
         $lastBlock = expandGitAlias $Matches['cmd'] $Matches['args']
     }