mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 04:19:41 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: git HEAD context

Browse source
This commit is contained in:
Jan De Dobbeleer 2020-10-07 11:13:42 +02:00 committed by Jan De Dobbeleer
parent dabc9d4f20
commit e0adc584e5
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
segment_git.go
View file

@ -47,6 +47,8 @@ const (
LocalStagingIcon Property = "local_staged_icon"
//DisplayStatus shows the status of the repository
DisplayStatus Property = "display_status"
//RebaseIcon shows before the rebase context
RebaseIcon Property = "rebase_icon"
)
func (g *git) enabled() bool {
@ -121,9 +123,17 @@ func (g *git) getGitOutputForCommand(args ...string) string {
}
func (g *git) getGitDetachedBranch() string {
ref := g.getGitOutputForCommand("symbolic-ref", "--short", "HEAD")
commit := g.getGitOutputForCommand("rev-parse", "--short", "HEAD")
rebase := g.getGitOutputForCommand("rebase", "--show-current-patch")
if rebase != "" {
return fmt.Sprintf("%s%s", g.props.getString(RebaseIcon, "REBASE: "), commit)
}
ref := g.getGitOutputForCommand("symbolic-ref", "-q", "--short", "HEAD")
if ref == "" {
return "unknown"
ref = g.getGitOutputForCommand("describe", "--tags", "--exact-match")
}
if ref == "" {
ref = commit
}
return ref
}

16
segment_git_test.go
View file

@ -138,11 +138,11 @@ func TestParseGitBranchInfoBehindandAhead(t *testing.T) {
assert.Equal(t, "1", got["ahead"])
}
// func TestGetGitStatus(t *testing.T) {
// env := new(environment)
// writer := gitWriter{
// env: env,
// }
// writer.getGitStatus()
// assert.NotEmpty(t, writer.repo)
// }
func TestGetGitStatus(t *testing.T) {
env := new(environment)
git := git{
env: env,
}
git.getGitStatus()
assert.NotEmpty(t, git.repo)
}