1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

Fix yellow/red coloring while rebasing

It determines the yellow/red status by getting the merge-base between the
current branch and its upstream; while we're rebasing, the current branch is
HEAD, so it tried to get the merge-base between HEAD and HEAD{u}, which doesn't
work. Fix this by passing the name of the checked-out branch separately.
This commit is contained in:
Stefan Haller
2023-08-19 09:17:12 +02:00
parent 9671f549a1
commit b1314349d7
4 changed files with 20 additions and 15 deletions

View File

@ -64,6 +64,7 @@ func (self *SwitchToSubCommitsController) viewCommits() error {
FilterPath: self.c.Modes().Filtering.GetPath(),
IncludeRebaseCommits: false,
RefName: ref.FullRefName(),
RefForPushedStatus: ref.FullRefName(),
},
)
if err != nil {