Add new commit status StatusCherryPickingOrReverting

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 committed 2025-04-20 16:06:15 +02:00
1 parent e90a3dc666
commit 98c19feccf
3 files changed
+3 -2

No files matched your search

+1 -1
View File
@@ -496,7 +496,7 @@ func (self *CommitLoader) getSequencerCommits() []*models.Commit {
commits = utils.Prepend(commits, &models.Commit{
Hash: t.Commit,
Name: t.Msg,
Status: models.StatusRebasing,
Status: models.StatusCherryPickingOrReverting,
Action: t.Command,
})
}
+1
View File
@@ -18,6 +18,7 @@ const (
StatusPushed
StatusMerged
StatusRebasing
StatusCherryPickingOrReverting
StatusConflicted
StatusReflog
)
+1 -1
View File
@@ -505,7 +505,7 @@ func getHashColor(
hashColor = style.FgYellow
case models.StatusMerged:
hashColor = style.FgGreen
case models.StatusRebasing, models.StatusConflicted:
case models.StatusRebasing, models.StatusCherryPickingOrReverting, models.StatusConflicted:
hashColor = style.FgBlue
case models.StatusReflog:
hashColor = style.FgBlue