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

stop checking out branches when doing a rename. Instead just move the cursor to the new position

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-06 15:13:40 +10:00
parent a3b0efb82e
commit 0719a3e36e
28 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/gui/branches_panel.go
View File

@ -428,9 +428,6 @@ func (gui *Gui) handleRenameBranch() error {
return nil
}
// TODO: find a way to not checkout the branch here if it's not the current branch (i.e. find some
// way to get it to show up in the reflog)
promptForNewName := func() error {
return gui.prompt(promptOpts{
title: gui.Tr.NewBranchNamePrompt + " " + branch.Name + ":",
@ -439,13 +436,21 @@ func (gui *Gui) handleRenameBranch() error {
if err := gui.GitCommand.RenameBranch(branch.Name, newBranchName); err != nil {
return gui.surfaceError(err)
}
// need to checkout so that the branch shows up in our reflog and therefore
// doesn't get lost among all the other branches when we switch to something else
if err := gui.GitCommand.Checkout(newBranchName, commands.CheckoutOptions{Force: false}); err != nil {
return gui.surfaceError(err)
// need to find where the branch is now so that we can re-select it. That means we need to refetch the branches synchronously and then find our branch
gui.refreshBranches()
// now that we've got our stuff again we need to find that branch and reselect it.
for i, newBranch := range gui.State.Branches {
if newBranch.Name == newBranchName {
gui.State.Panels.Branches.SetSelectedLineIdx(i)
if err := gui.State.Contexts.Branches.HandleRender(); err != nil {
return err
}
}
}
return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
return nil
},
})
}