From 9671f549a17becbf0354cf953c5210e09810600c Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sat, 19 Aug 2023 08:47:22 +0200 Subject: [PATCH] Fix the blue sha color of todo commits while rebasing This broke with 5d8a85f7e78. --- pkg/commands/git_commands/commit_loader.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/commands/git_commands/commit_loader.go b/pkg/commands/git_commands/commit_loader.go index ab13e6523..b7cd45442 100644 --- a/pkg/commands/git_commands/commit_loader.go +++ b/pkg/commands/git_commands/commit_loader.go @@ -123,10 +123,12 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit, if commit.Sha == firstPushedCommit { passedFirstPushedCommit = true } - if passedFirstPushedCommit { - commit.Status = models.StatusPushed - } else { - commit.Status = models.StatusUnpushed + if commit.Status != models.StatusRebasing { + if passedFirstPushedCommit { + commit.Status = models.StatusPushed + } else { + commit.Status = models.StatusUnpushed + } } }