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

fix: show GPG error before entering commit editor

Browse Source 
Closes #4611
This commit is contained in:
Mostafa Khaled
2025-06-23 23:52:31 +03:00
committed by Stefan Haller
parent ef6f96bda3
commit 9e05e4d810
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_commands/rebase.go
View File

@ -35,6 +35,8 @@ func NewRebaseCommands(
} }
func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, summary string, description string) error { func (self *RebaseCommands) RewordCommit(commits []*models.Commit, index int, summary string, description string) error {
// This check is currently unreachable (handled in LocalCommitsController.reword),
// but kept as a safeguard in case this method is used elsewhere.
if self.config.NeedsGpgSubprocessForCommit() { if self.config.NeedsGpgSubprocessForCommit() {
return errors.New(self.Tr.DisabledForGPG) return errors.New(self.Tr.DisabledForGPG)
} }

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

@ -343,6 +343,10 @@ func (self *LocalCommitsController) fixup(selectedCommits []*models.Commit, star
} }
func (self *LocalCommitsController) reword(commit *models.Commit) error { func (self *LocalCommitsController) reword(commit *models.Commit) error {
commitIdx := self.context().GetSelectedLineIdx()
if self.c.Git().Config.NeedsGpgSubprocessForCommit() && !self.isHeadCommit(commitIdx) {
return errors.New(self.c.Tr.DisabledForGPG)
}
commitMessage, err := self.c.Git().Commit.GetCommitMessage(commit.Hash()) commitMessage, err := self.c.Git().Commit.GetCommitMessage(commit.Hash())
if err != nil { if err != nil {
return err return err
@ -352,7 +356,7 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error {
} }
self.c.Helpers().Commits.OpenCommitMessagePanel( self.c.Helpers().Commits.OpenCommitMessagePanel(
&helpers.OpenCommitMessagePanelOpts{ &helpers.OpenCommitMessagePanelOpts{
CommitIndex: self.context().GetSelectedLineIdx(), CommitIndex: commitIdx,
InitialMessage: commitMessage, InitialMessage: commitMessage,
SummaryTitle: self.c.Tr.Actions.RewordCommit, SummaryTitle: self.c.Tr.Actions.RewordCommit,
DescriptionTitle: self.c.Tr.CommitDescriptionTitle, DescriptionTitle: self.c.Tr.CommitDescriptionTitle,