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

Show error when trying to open patch menu with an empty patch (#2829)

Browse Source
This commit is contained in:
Stefan Haller
2023-07-26 14:34:58 +02:00
committed by GitHub
parent decb055df9 67a7293e79
commit 6be9109aaa
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,10 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
return self.c.ErrorMsg(self.c.Tr.NoPatchError) return self.c.ErrorMsg(self.c.Tr.NoPatchError)
} }
if self.c.Git().Patch.PatchBuilder.IsEmpty() {
return self.c.ErrorMsg(self.c.Tr.EmptyPatchError)
}
menuItems := []*types.MenuItem{ menuItems := []*types.MenuItem{
{ {
Label: self.c.Tr.ResetPatch, Label: self.c.Tr.ResetPatch,

2
pkg/i18n/english.go
View File

@ -323,6 +323,7 @@ type TranslationSet struct {
ViewPatchOptions string ViewPatchOptions string
PatchOptionsTitle string PatchOptionsTitle string
NoPatchError string NoPatchError string
EmptyPatchError string
EnterFile string EnterFile string
ExitCustomPatchBuilder string ExitCustomPatchBuilder string
EnterUpstream string EnterUpstream string
@ -1017,6 +1018,7 @@ func EnglishTranslationSet() TranslationSet {
ViewPatchOptions: "View custom patch options", ViewPatchOptions: "View custom patch options",
PatchOptionsTitle: "Patch options", PatchOptionsTitle: "Patch options",
NoPatchError: "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines", NoPatchError: "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines",
EmptyPatchError: "Patch is still empty. Add some files or lines to your patch first.",
EnterFile: "Enter file to add selected lines to the patch (or toggle directory collapsed)", EnterFile: "Enter file to add selected lines to the patch (or toggle directory collapsed)",
ExitCustomPatchBuilder: `Exit custom patch builder`, ExitCustomPatchBuilder: `Exit custom patch builder`,
EnterUpstream: `Enter upstream as '<remote> <branchname>'`, EnterUpstream: `Enter upstream as '<remote> <branchname>'`,