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

rename variable to failedCommitMessage

Browse Source
This commit is contained in:
Jakob Kogler
2021-12-25 13:54:46 +01:00
committed by Jesse Duffield
parent d517531c16
commit 68fc6059d3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/commit_message_panel.go
View File

@@ -10,7 +10,7 @@ import (
func (gui *Gui) handleCommitConfirm() error { func (gui *Gui) handleCommitConfirm() error {
message := strings.TrimSpace(gui.Views.CommitMessage.TextArea.GetContent()) message := strings.TrimSpace(gui.Views.CommitMessage.TextArea.GetContent())
gui.State.messageFailedCommit = message gui.State.failedCommitMessage = message
if message == "" { if message == "" {
return gui.createErrorPanel(gui.Tr.CommitWithoutMessageErr) return gui.createErrorPanel(gui.Tr.CommitWithoutMessageErr)
} }
@@ -30,7 +30,7 @@ func (gui *Gui) handleCommitConfirm() error {
_ = gui.returnFromContext() _ = gui.returnFromContext()
return gui.withGpgHandling(cmdObj, gui.Tr.CommittingStatus, func() error { return gui.withGpgHandling(cmdObj, gui.Tr.CommittingStatus, func() error {
gui.Views.CommitMessage.ClearTextArea() gui.Views.CommitMessage.ClearTextArea()
gui.State.messageFailedCommit = "" gui.State.failedCommitMessage = ""
return nil return nil
}) })
} }

4
pkg/gui/files_panel.go
View File

@@ -386,9 +386,9 @@ func (gui *Gui) handleCommitPress() error {
return gui.promptToStageAllAndRetry(gui.handleCommitPress) return gui.promptToStageAllAndRetry(gui.handleCommitPress)
} }
if len(gui.State.messageFailedCommit) > 0 { if len(gui.State.failedCommitMessage) > 0 {
gui.Views.CommitMessage.ClearTextArea() gui.Views.CommitMessage.ClearTextArea()
gui.Views.CommitMessage.TextArea.TypeString(gui.State.messageFailedCommit) gui.Views.CommitMessage.TextArea.TypeString(gui.State.failedCommitMessage)
gui.Views.CommitMessage.RenderTextArea() gui.Views.CommitMessage.RenderTextArea()
} else { } else {
commitPrefixConfig := gui.commitPrefixConfigForRepo() commitPrefixConfig := gui.commitPrefixConfigForRepo()

2
pkg/gui/gui.go
View File

@@ -348,7 +348,7 @@ type guiState struct {
FilesTrie *patricia.Trie FilesTrie *patricia.Trie
// this is the message of the last failed commit attempt // this is the message of the last failed commit attempt
messageFailedCommit string failedCommitMessage string
} }
// reuseState determines if we pull the repo state from our repo state map or // reuseState determines if we pull the repo state from our repo state map or