go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
Code Issues Releases Activity

Fix the blue sha color of todo commits while rebasing

Browse Source 
This broke with 5d8a85f7e7.
This commit is contained in:
Stefan Haller 2023-08-19 08:47:22 +02:00
parent 689deb72bd
commit 9671f549a1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_commands/commit_loader.go
View File

@ -123,12 +123,14 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
if commit.Sha == firstPushedCommit { if commit.Sha == firstPushedCommit {
passedFirstPushedCommit = true passedFirstPushedCommit = true
} }
if commit.Status != models.StatusRebasing {
if passedFirstPushedCommit { if passedFirstPushedCommit {
commit.Status = models.StatusPushed commit.Status = models.StatusPushed
} else { } else {
commit.Status = models.StatusUnpushed commit.Status = models.StatusUnpushed
} }
} }
}
if len(commits) == 0 { if len(commits) == 0 {
return commits, nil return commits, nil