go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-05 00:59:19 +02:00
Code Issues Releases Activity

WIP Show both ahead and behind

Browse Source
This commit is contained in:
Stefan Haller
2024-05-04 09:25:49 +02:00
committed by Jesse Duffield
parent 6eaece3696
commit 6d2ec43596
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/commands/git_commands/branch_loader.go
View File

@ -125,6 +125,7 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit, existingMainBranc
return b.Name == branch.Name
}); found {
branch.BehindBaseBranch.Store(oldBranch.BehindBaseBranch.Load())
branch.AheadOfBaseBranch.Store(oldBranch.AheadOfBaseBranch.Load())
}
}
@ -153,9 +154,12 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit, existingMainBranc
if len(aheadBehindStr) != 2 {
return errors.New("unexpected output from git rev-list")
}
if behind, err := strconv.Atoi(aheadBehindStr[1]); err == nil {
branch.BehindBaseBranch.Store(int32(behind))
renderFunc()
if ahead, err := strconv.Atoi(aheadBehindStr[0]); err == nil {
if behind, err := strconv.Atoi(aheadBehindStr[1]); err == nil {
branch.AheadOfBaseBranch.Store(int32(ahead))
branch.BehindBaseBranch.Store(int32(behind))
renderFunc()
}
}
}
}