1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
This commit is contained in:
Jesse Duffield
2021-04-03 15:56:11 +11:00
parent fafd5234bd
commit 0898a7bb57
36 changed files with 215 additions and 171 deletions

View File

@ -42,7 +42,7 @@ func (gui *Gui) handleCreatePatchOptionsMenu() error {
},
}...)
if gui.currentContext().GetKey() == gui.Contexts.BranchCommits.GetKey() {
if gui.currentContext().GetKey() == gui.State.Contexts.BranchCommits.GetKey() {
selectedCommit := gui.getSelectedLocalCommit()
if selectedCommit != nil && gui.GitCommand.PatchManager.To != selectedCommit.Sha {
// adding this option to index 1
@ -179,7 +179,7 @@ func (gui *Gui) handleApplyPatch(reverse bool) error {
func (gui *Gui) handleResetPatch() error {
gui.GitCommand.PatchManager.Reset()
if gui.currentContextKeyIgnoringPopups() == MAIN_PATCH_BUILDING_CONTEXT_KEY {
if err := gui.pushContext(gui.Contexts.CommitFiles); err != nil {
if err := gui.pushContext(gui.State.Contexts.CommitFiles); err != nil {
return err
}
}