diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-08-19 08:47:22 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-08-19 09:24:00 +0200 |
| commit | 9671f549a17becbf0354cf953c5210e09810600c (patch) | |
| tree | 1dda2b4b895d3c0b9c1a77ccda5c5232f7b0cc51 /pkg/commands | |
| parent | 689deb72bd8f004985fee31bf8047345cb408d1a (diff) | |
Fix the blue sha color of todo commits while rebasing
This broke with 5d8a85f7e78.
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git_commands/commit_loader.go | 10 |
1 files 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 + } } } |