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

better error handling

Browse Source
This commit is contained in:
Jesse Duffield
2020-03-28 11:47:54 +11:00
parent 7876cddf4a
commit 814ee24c8d
21 changed files with 108 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/rebase_options_panel.go
View File

@@ -40,7 +40,7 @@ func (gui *Gui) genericMergeCommand(command string) error {
status := gui.workingTreeState()
if status != "merging" && status != "rebasing" {
return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NotMergingOrRebasing"))
return gui.createErrorPanel(gui.Tr.SLocalize("NotMergingOrRebasing"))
}
commandType := strings.Replace(status, "ing", "e", 1)
@@ -83,6 +83,6 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error {
},
)
} else {
return gui.createErrorPanel(gui.g, result.Error())
return gui.createErrorPanel(result.Error())
}
}