utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-12 16:46:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a color other than yellow or red for commits on a branch that doesn't have an upstream

Browse source
This commit is contained in:
Stefan Haller 2025-11-02 16:06:14 +01:00
parent 80dd695d7a
commit ed4d57c800
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/commands/git_commands/commit_loader.go
View file

@ -546,7 +546,9 @@ func setCommitStatuses(unpushedCommitHashes *set.Set[string], unmergedCommitHash
}
if unmergedCommitHashes == nil || unmergedCommitHashes.Includes(commit.Hash()) {
if unpushedCommitHashes != nil && unpushedCommitHashes.Includes(commit.Hash()) {
if unpushedCommitHashes == nil {
commits[i].Status = models.StatusNone
} else if unpushedCommitHashes.Includes(commit.Hash()) {
commits[i].Status = models.StatusUnpushed
} else {
commits[i].Status = models.StatusPushed
@ -569,7 +571,7 @@ func (self *CommitLoader) getReachableHashes(refName string, notRefNames []strin
DontLog().
RunWithOutputs()
if err != nil {
return set.New[string]()
return nil
}
return set.NewFromSlice(utils.SplitLines(output))

3
pkg/gui/presentation/commits.go
View file

@ -483,6 +483,8 @@ func getHashColor(
diffed := commit.Hash() != "" && commit.Hash() == diffName
hashColor := theme.DefaultTextColor
switch commit.Status {
case models.StatusNone:
hashColor = style.FgMagenta // or style.FgCyan
case models.StatusUnpushed:
hashColor = style.FgRed
case models.StatusPushed:
@ -493,7 +495,6 @@ func getHashColor(
hashColor = style.FgBlue
case models.StatusReflog:
hashColor = style.FgBlue
default:
}
if diffed {