Merge pull request #805 from wallybh/plus-sign

dahlbyk · web-flow · commit c7f084e7badd · 2020-10-25T22:55:13.000-05:00
Fix tab completion of branches in different worktrees
diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -135,7 +135,7 @@ function script:gitBranches($filter, $includeHEAD = $false, $prefix = '') {
         $filter = $matches['to']
     }
 
-    $branches = @(git branch --no-color | ForEach-Object { if (($_ -notmatch "^\* \(HEAD detached .+\)$") -and ($_ -match "^\*?\s*(?<ref>.*)")) { $matches['ref'] } }) +
+    $branches = @(git branch --no-color | ForEach-Object { if (($_ -notmatch "^\* \(HEAD detached .+\)$") -and ($_ -match "^[\*\+]?\s*(?<ref>.*)")) { $matches['ref'] } }) +
                 @(git branch --no-color -r | ForEach-Object { if ($_ -match "^  (?<ref>\S+)(?: -> .+)?") { $matches['ref'] } }) +
                 @(if ($includeHEAD) { 'HEAD','FETCH_HEAD','ORIG_HEAD','MERGE_HEAD' })
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ function script:gitBranches($filter, $includeHEAD = $false, $prefix = '') {`
`135`	`135`	`$filter = $matches['to']`
`136`	`136`	`}`
`137`	`137`
`138`		`- $branches = @(git branch --no-color \| ForEach-Object { if (($_ -notmatch "^\* \(HEAD detached .+\)$") -and ($_ -match "^\?\s(?<ref>.*)")) { $matches['ref'] } }) +`
	`138`	`+ $branches = @(git branch --no-color \| ForEach-Object { if (($_ -notmatch "^\* \(HEAD detached .+\)$") -and ($_ -match "^[\\+]?\s(?<ref>.*)")) { $matches['ref'] } }) +`
`139`	`139`	`@(git branch --no-color -r \| ForEach-Object { if ($_ -match "^ (?<ref>\S+)(?: -> .+)?") { $matches['ref'] } }) +`
`140`	`140`	`@(if ($includeHEAD) { 'HEAD','FETCH_HEAD','ORIG_HEAD','MERGE_HEAD' })`
`141`	`141`