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

fix integration tests

Browse Source
This commit is contained in:
Jesse Duffield 2022-02-27 10:18:03 +11:00
parent c7b03bd3c2
commit cf00949b85
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers/local_commits_controller.go
View File

@ -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 { if len(self.model.Commits) <= 1 {
return self.c.ErrorMsg(self.c.Tr.YouNoCommitsToSquash) 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( prompt := utils.ResolvePlaceholderString(
self.c.Tr.SureCreateFixupCommit, self.c.Tr.SureCreateFixupCommit,
map[string]string{ map[string]string{