go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00
Code Issues Releases Activity

correct typo in keybinding for delete branch

Browse Source
This commit is contained in:
Jesse Duffield 2018-08-11 15:45:38 +10:00
parent 2c140445e5
commit 9626ebdf35
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
branches_panel.go
View File

@ -51,7 +51,7 @@ func handleNewBranch(g *gocui.Gui, v *gocui.View) error {
return nil return nil
} }
func handleDeleteBranch(g *gocui.Gui, v *gocui.View) error { func handleDeleteBranch(g *gocui.Gui, v *gocui.View) error {
checkedOutBranch := state.Branches[0] checkedOutBranch := state.Branches[0]
selectedBranch := getSelectedBranch(v) selectedBranch := getSelectedBranch(v)
if checkedOutBranch.Name == selectedBranch.Name { if checkedOutBranch.Name == selectedBranch.Name {
@ -59,13 +59,12 @@ func handleDeleteBranch(g *gocui.Gui, v *gocui.View) error {
} }
return createConfirmationPanel(g, v, "Delete Branch", "Are you sure you want delete the branch "+selectedBranch.Name+" ?", func(g *gocui.Gui, v *gocui.View) error { return createConfirmationPanel(g, v, "Delete Branch", "Are you sure you want delete the branch "+selectedBranch.Name+" ?", func(g *gocui.Gui, v *gocui.View) error {
if output, err := gitDeleteBranch(selectedBranch.Name); err != nil { if output, err := gitDeleteBranch(selectedBranch.Name); err != nil {
return createErrorPanel(g, output) return createErrorPanel(g, output)
} }
return refreshSidePanels(g) return refreshSidePanels(g)
}, nil) }, nil)
} }
func handleMerge(g *gocui.Gui, v *gocui.View) error { func handleMerge(g *gocui.Gui, v *gocui.View) error {
checkedOutBranch := state.Branches[0] checkedOutBranch := state.Branches[0]
selectedBranch := getSelectedBranch(v) selectedBranch := getSelectedBranch(v)
@ -91,7 +90,7 @@ func renderBranchesOptions(g *gocui.Gui) error {
"m": "merge", "m": "merge",
"c": "checkout by name", "c": "checkout by name",
"n": "new branch", "n": "new branch",
"d": "delte branch", "d": "delete branch",
"← → ↑ ↓": "navigate", "← → ↑ ↓": "navigate",
}) })
} }