mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-28 11:31:04 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(git): initialize status correctly

Browse source
This commit is contained in:
Jan De Dobbeleer 2021-12-08 14:53:41 +01:00
parent f25ade45cf
commit d9e642a132
No known key found for this signature in database
GPG key ID: F6CC273CE5BA9AEE
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/segment_git.go
View file

@ -280,6 +280,8 @@ func (g *git) setGitStatus() {
UPSTREAM = "# branch.upstream " UPSTREAM = "# branch.upstream "
BRANCHSTATUS = "# branch.ab " BRANCHSTATUS = "# branch.ab "
) )
g.Working = &GitStatus{}
g.Staging = &GitStatus{}
output := g.getGitCommandOutput("status", "-unormal", "--branch", "--porcelain=2") output := g.getGitCommandOutput("status", "-unormal", "--branch", "--porcelain=2")
for _, line := range strings.Split(output, "\n") { for _, line := range strings.Split(output, "\n") {
if strings.HasPrefix(line, HASH) { if strings.HasPrefix(line, HASH) {

2
src/segment_git_test.go
View file

@ -364,8 +364,6 @@ func TestSetGitStatus(t *testing.T) {
if tc.ExpectedStaging == nil { if tc.ExpectedStaging == nil {
tc.ExpectedStaging = &GitStatus{} tc.ExpectedStaging = &GitStatus{}
} }
g.Working = &GitStatus{}
g.Staging = &GitStatus{}
g.setGitStatus() g.setGitStatus()
assert.Equal(t, tc.ExpectedStaging, g.Staging, tc.Case) assert.Equal(t, tc.ExpectedStaging, g.Staging, tc.Case)
assert.Equal(t, tc.ExpectedWorking, g.Working, tc.Case) assert.Equal(t, tc.ExpectedWorking, g.Working, tc.Case)