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

Better error message when trying to amend a commit other than head during rebase

Browse Source
This commit is contained in:
Stefan Haller
2023-03-20 13:13:43 +01:00
parent e7d0116312
commit d508badd62
3 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,6 +452,10 @@ func (self *LocalCommitsController) amendTo(commit *models.Commit) error {
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
}
if self.git.Status.WorkingTreeState() != enums.REBASE_MODE_NONE {
return self.c.ErrorMsg(self.c.Tr.AlreadyRebasing)
}
return self.c.Confirm(types.ConfirmOpts{
Title: self.c.Tr.AmendCommitTitle,
Prompt: self.c.Tr.AmendCommitPrompt,