Skip to content

Commit 98c19fe

Browse files
committed
Add new commit status StatusCherryPickingOrReverting
This is needed because we want to show different section headers for rebase todos and cherry-pick/revert todos.
1 parent e90a3dc commit 98c19fe

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

pkg/commands/git_commands/commit_loader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ func (self *CommitLoader) getSequencerCommits() []*models.Commit {
496496
commits = utils.Prepend(commits, &models.Commit{
497497
Hash: t.Commit,
498498
Name: t.Msg,
499-
Status: models.StatusRebasing,
499+
Status: models.StatusCherryPickingOrReverting,
500500
Action: t.Command,
501501
})
502502
}

pkg/commands/models/commit.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const (
1818
StatusPushed
1919
StatusMerged
2020
StatusRebasing
21+
StatusCherryPickingOrReverting
2122
StatusConflicted
2223
StatusReflog
2324
)

pkg/gui/presentation/commits.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ func getHashColor(
505505
hashColor = style.FgYellow
506506
case models.StatusMerged:
507507
hashColor = style.FgGreen
508-
case models.StatusRebasing, models.StatusConflicted:
508+
case models.StatusRebasing, models.StatusCherryPickingOrReverting, models.StatusConflicted:
509509
hashColor = style.FgBlue
510510
case models.StatusReflog:
511511
hashColor = style.FgBlue

0 commit comments

Comments
 (0)