Merge pull request dahlbyk#868 from dmringo/patch-1

Fix branch regex to handle symbolic refs
pa-0 · Mar 27, 2022 · ad8278e · ad8278e
2 parents 151ce6c + 6dc6d65
commit ad8278e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -136,7 +136,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>\S+)(?: -> .+)?")) { $matches['ref'] } }) +
                 @(git branch --no-color -r | ForEach-Object { if ($_ -match "^  (?<ref>\S+)(?: -> .+)?") { $matches['ref'] } }) +
                 @(if ($includeHEAD) { 'HEAD','FETCH_HEAD','ORIG_HEAD','MERGE_HEAD' })
 

diff --git a/test/TabExpansion.Tests.ps1 b/test/TabExpansion.Tests.ps1
@@ -181,6 +181,22 @@ Describe 'TabExpansion Tests' {
                 &$gitbin branch -D $branchName
             }
         }
+
+        It 'Tab completes branch names that are symbolic refs' {
+            $branchName = 'symbolic-ref--for-Pester-tests'
+            if (&$gitbin branch --list -q $branchName) {
+                &$gitbin branch -D $branchName
+            }
+
+            &$gitbin symbolic-ref refs/heads/$branchName refs/heads/master
+            try {
+                $result = & $module GitTabExpansionInternal 'git checkout symbolic-ref--for-Pester-test'
+                $result | Should -BeExactly $branchName
+            }
+            finally {
+                &$gitbin branch -D $branchName
+            }
+        }
     }
 
     Context 'Restore Source Branch TabExpansion Tests' {