Skip to content

Commit

Permalink
fix integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jesseduffield committed Mar 17, 2022
1 parent c7b03bd commit cf00949
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/gui/controllers/local_commits_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit cf00949

Please sign in to comment.