go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity

Add new commit status StatusCherryPickingOrReverting

Browse Source 
This is needed because we want to show different section headers for rebase
todos and cherry-pick/revert todos.
This commit is contained in:
Stefan Haller
2025-04-05 11:05:46 +02:00
parent e90a3dc666
commit 98c19feccf
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,7 +496,7 @@ func (self *CommitLoader) getSequencerCommits() []*models.Commit {
commits = utils.Prepend(commits, &models.Commit{ commits = utils.Prepend(commits, &models.Commit{
Hash: t.Commit, Hash: t.Commit,
Name: t.Msg, Name: t.Msg,
Status: models.StatusRebasing, Status: models.StatusCherryPickingOrReverting,
Action: t.Command, Action: t.Command,
}) })
} }

1
pkg/commands/models/commit.go
View File

@ -18,6 +18,7 @@ const (
StatusPushed StatusPushed
StatusMerged StatusMerged
StatusRebasing StatusRebasing
StatusCherryPickingOrReverting
StatusConflicted StatusConflicted
StatusReflog StatusReflog
) )

2
pkg/gui/presentation/commits.go
View File

@ -505,7 +505,7 @@ func getHashColor(
hashColor = style.FgYellow hashColor = style.FgYellow
case models.StatusMerged: case models.StatusMerged:
hashColor = style.FgGreen hashColor = style.FgGreen
case models.StatusRebasing, models.StatusConflicted: case models.StatusRebasing, models.StatusCherryPickingOrReverting, models.StatusConflicted:
hashColor = style.FgBlue hashColor = style.FgBlue
case models.StatusReflog: case models.StatusReflog:
hashColor = style.FgBlue hashColor = style.FgBlue