diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-02-27 10:18:03 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | cf00949b85b72e4d4726c127a285b748a6a4ba55 (patch) | |
| tree | 22a71723c68eb87931307e87f409bf3e7d3bfd57 /pkg/gui/controllers/local_commits_controller.go | |
| parent | c7b03bd3c2958cb6f08c1da8ea96749f6f91b8ad (diff) | |
fix integration tests
Diffstat (limited to 'pkg/gui/controllers/local_commits_controller.go')
| -rw-r--r-- | pkg/gui/controllers/local_commits_controller.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index d8c257cb9..1693f19c3 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -208,7 +208,7 @@ func (self *LocalCommitsController) squashDown(commit *models.Commit) error { }) } -func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) error { +func (self *LocalCommitsController) fixup(commit *models.Commit) error { if len(self.model.Commits) <= 1 { return self.c.ErrorMsg(self.c.Tr.YouNoCommitsToSquash) } @@ -507,7 +507,7 @@ func (self *LocalCommitsController) afterRevertCommit() error { }) } -func (self *LocalCommitsController) fixup(commit *models.Commit) error { +func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) error { prompt := utils.ResolvePlaceholderString( self.c.Tr.SureCreateFixupCommit, map[string]string{ |