diff options
Diffstat (limited to 'pkg/gui/controllers/helpers/refresh_helper.go')
| -rw-r--r-- | pkg/gui/controllers/helpers/refresh_helper.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 04b741b56..da43c47bb 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -317,6 +317,7 @@ func (self *RefreshHelper) refreshCommitsWithLimit() error { git_commands.GetCommitsOptions{ Limit: self.c.Contexts().LocalCommits.GetLimitCommits(), FilterPath: self.c.Modes().Filtering.GetPath(), + FilterAuthor: self.c.Modes().Filtering.GetAuthor(), IncludeRebaseCommits: true, RefName: self.refForLog(), RefForPushedStatus: checkedOutBranchName, @@ -342,6 +343,7 @@ func (self *RefreshHelper) refreshSubCommitsWithLimit() error { git_commands.GetCommitsOptions{ Limit: self.c.Contexts().SubCommits.GetLimitCommits(), FilterPath: self.c.Modes().Filtering.GetPath(), + FilterAuthor: self.c.Modes().Filtering.GetAuthor(), IncludeRebaseCommits: false, RefName: self.c.Contexts().SubCommits.GetRef().FullRefName(), RefToShowDivergenceFrom: self.c.Contexts().SubCommits.GetRefToShowDivergenceFrom(), @@ -438,7 +440,7 @@ func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSele // which allows us to order them correctly. So if we're filtering we'll just // manually load all the reflog commits here var err error - reflogCommits, _, err = self.c.Git().Loaders.ReflogCommitLoader.GetReflogCommits(nil, "") + reflogCommits, _, err = self.c.Git().Loaders.ReflogCommitLoader.GetReflogCommits(nil, "", "") if err != nil { self.c.Log.Error(err) } @@ -597,9 +599,9 @@ func (self *RefreshHelper) refreshReflogCommits() error { lastReflogCommit = model.ReflogCommits[0] } - refresh := func(stateCommits *[]*models.Commit, filterPath string) error { + refresh := func(stateCommits *[]*models.Commit, filterPath string, filterAuthor string) error { commits, onlyObtainedNewReflogCommits, err := self.c.Git().Loaders.ReflogCommitLoader. - GetReflogCommits(lastReflogCommit, filterPath) + GetReflogCommits(lastReflogCommit, filterPath, filterAuthor) if err != nil { return self.c.Error(err) } @@ -612,12 +614,12 @@ func (self *RefreshHelper) refreshReflogCommits() error { return nil } - if err := refresh(&model.ReflogCommits, ""); err != nil { + if err := refresh(&model.ReflogCommits, "", ""); err != nil { return err } if self.c.Modes().Filtering.Active() { - if err := refresh(&model.FilteredReflogCommits, self.c.Modes().Filtering.GetPath()); err != nil { + if err := refresh(&model.FilteredReflogCommits, self.c.Modes().Filtering.GetPath(), self.c.Modes().Filtering.GetAuthor()); err != nil { return err } } else { |