mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(git): set .Ref correctly on detached HEAD

Browse source 
resolves #5035
This commit is contained in:
Jan De Dobbeleer 2024-06-10 16:19:49 +02:00 committed by Jan De Dobbeleer
parent ddd120178d
commit fbc21b8c97
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/segments/git.go
View file

@ -750,6 +750,7 @@ func (g *Git) setPrettyHEADName() {
g.Detached = !strings.HasPrefix(HEADRef, "ref:") g.Detached = !strings.HasPrefix(HEADRef, "ref:")
if strings.HasPrefix(HEADRef, BRANCHPREFIX) { if strings.HasPrefix(HEADRef, BRANCHPREFIX) {
branchName := strings.TrimPrefix(HEADRef, BRANCHPREFIX) branchName := strings.TrimPrefix(HEADRef, BRANCHPREFIX)
g.Ref = branchName
g.HEAD = fmt.Sprintf("%s%s", g.props.GetString(BranchIcon, "\uE0A0"), g.formatHEAD(branchName)) g.HEAD = fmt.Sprintf("%s%s", g.props.GetString(BranchIcon, "\uE0A0"), g.formatHEAD(branchName))
return return
} }
@ -757,12 +758,14 @@ func (g *Git) setPrettyHEADName() {
if len(HEADRef) >= 7 { if len(HEADRef) >= 7 {
g.ShortHash = HEADRef[0:7] g.ShortHash = HEADRef[0:7]
g.Hash = HEADRef[0:] g.Hash = HEADRef[0:]
g.Ref = g.ShortHash
} }
} }
// check for tag // check for tag
tagName := g.getGitCommandOutput("describe", "--tags", "--exact-match") tagName := g.getGitCommandOutput("describe", "--tags", "--exact-match")
if len(tagName) > 0 { if len(tagName) > 0 {
g.Ref = tagName
g.HEAD = fmt.Sprintf("%s%s", g.props.GetString(TagIcon, "\uF412"), tagName) g.HEAD = fmt.Sprintf("%s%s", g.props.GetString(TagIcon, "\uF412"), tagName)
return return
} }