Merge pull request #307 from JanJoris/bugfix/error_on_describe

Removed error thrown by symbolic-ref and describe
dahlbyk · Oct 10, 2016 · fba883f · fba883f
2 parents c39da78 + cbd6be9
commit fba883f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/GitUtils.ps1 b/GitUtils.ps1
@@ -46,15 +46,15 @@ function Get-GitBranch($gitDir = $(Get-GitDirectory), [Diagnostics.Stopwatch]$sw
             }
 
             $b = Invoke-NullCoalescing `
-                { dbg 'Trying symbolic-ref' $sw; git symbolic-ref HEAD 2>$null } `
+                { dbg 'Trying symbolic-ref' $sw; git symbolic-ref HEAD -q 2>$null } `
                 { '({0})' -f (Invoke-NullCoalescing `
                     {
                         dbg 'Trying describe' $sw
                         switch ($Global:GitPromptSettings.DescribeStyle) {
                             'contains' { git describe --contains HEAD 2>$null }
                             'branch' { git describe --contains --all HEAD 2>$null }
                             'describe' { git describe HEAD 2>$null }
-                            default { git describe --tags --exact-match HEAD 2>$null }
+                            default { git tag --points-at HEAD 2>$null }
                         }
                     } `
                     {