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

Don't return commits from setCommitMergedStatuses

Browse Source 
Since the slice stores pointers to objects, and we're only modifying the objects
but not the slice itself, there's no need to return it and assign it back. This
will allow us to call the function for subslices of commits.

Also, move the condition that checks for an empty string inside the function;
we're going to call it from more than one place, so this makes it easier.
This commit is contained in:
Stefan Haller 2023-08-21 16:31:20 +02:00
parent 1fb0e1e151
commit 911aa7774b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/commands/git_commands/commit_loader.go
View File

@ -137,9 +137,7 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
return commits, nil return commits, nil
} }
if ancestor != "" { setCommitMergedStatuses(ancestor, commits)
commits = setCommitMergedStatuses(ancestor, commits)
}
return commits, nil return commits, nil
} }
@ -495,7 +493,11 @@ func (self *CommitLoader) commitFromPatch(content string) *models.Commit {
} }
} }
func setCommitMergedStatuses(ancestor string, commits []*models.Commit) []*models.Commit { func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
if ancestor == "" {
return
}
passedAncestor := false passedAncestor := false
for i, commit := range commits { for i, commit := range commits {
// some commits aren't really commits and don't have sha's, such as the update-ref todo // some commits aren't really commits and don't have sha's, such as the update-ref todo
@ -509,7 +511,6 @@ func setCommitMergedStatuses(ancestor string, commits []*models.Commit) []*model
commits[i].Status = models.StatusMerged commits[i].Status = models.StatusMerged
} }
} }
return commits
} }
func (self *CommitLoader) getMergeBase(refName string) string { func (self *CommitLoader) getMergeBase(refName string) string {

3
pkg/commands/git_commands/commit_loader_test.go
View File

@ -548,7 +548,8 @@ func TestCommitLoader_setCommitMergedStatuses(t *testing.T) {
for _, scenario := range scenarios { for _, scenario := range scenarios {
t.Run(scenario.testName, func(t *testing.T) { t.Run(scenario.testName, func(t *testing.T) {
expectedCommits := setCommitMergedStatuses(scenario.ancestor, scenario.commits) expectedCommits := scenario.commits
setCommitMergedStatuses(scenario.ancestor, expectedCommits)
assert.Equal(t, scenario.expectedCommits, expectedCommits) assert.Equal(t, scenario.expectedCommits, expectedCommits)
}) })
} }