mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-27 03:49:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(git): fetch branch name from HEAD file

Browse source
This commit is contained in:
Jan De Dobbeleer 2021-08-05 06:43:12 +02:00 committed by Jan De Dobbeleer
parent f6c79050d0
commit dff3986258
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/segment_git.go
View file

@ -406,7 +406,12 @@ func (g *git) getGitRefFileSymbolicName(refFile string) string {
}
func (g *git) getPrettyHEADName() string {
ref := g.getGitCommandOutput("branch", "--show-current")
var ref string
HEAD := g.getGitFileContents("HEAD")
branchPrefix := "ref: refs/heads/"
if strings.HasPrefix(HEAD, branchPrefix) {
ref = strings.TrimPrefix(HEAD, branchPrefix)
}
if ref != "" {
ref = g.truncateBranch(ref)
return fmt.Sprintf("%s%s", g.props.getString(BranchIcon, "\uE0A0"), ref)

1
src/segment_git_test.go
View file

@ -105,6 +105,7 @@ func setupHEADContextEnv(context *detachedContext) *git {
env.On("getFileContent", "/REVERT_HEAD").Return(context.revertSHA)
env.On("getFileContent", "/MERGE_MSG").Return(fmt.Sprintf("Merge branch '%s' into %s", context.mergeHEAD, context.onto))
env.On("getFileContent", "/sequencer/todo").Return(context.sequencerTodo)
env.On("getFileContent", "/HEAD").Return(context.branchName)
env.On("hasFilesInDir", "", "CHERRY_PICK_HEAD").Return(context.cherryPick)
env.On("hasFilesInDir", "", "REVERT_HEAD").Return(context.revert)
env.On("hasFilesInDir", "", "MERGE_MSG").Return(context.merge)