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

more refactoring

Browse Source 
WIP

WIP
This commit is contained in:
Jesse Duffield
2021-06-05 15:56:50 +10:00
parent 93bf691fd6
commit 9fdf92b226
5 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/gui/branches_panel.go
View File

@@ -379,16 +379,14 @@ func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error {
func (gui *Gui) handleFastForward() error {
branch := gui.getSelectedBranch()
if branch == nil {
if branch == nil || !branch.IsRealBranch() {
return nil
}
if branch.Pushables == "" {
return nil
}
if branch.Pushables == "?" {
if !branch.IsTrackingRemote() {
return gui.createErrorPanel(gui.Tr.FwdNoUpstream)
}
if branch.Pushables != "0" {
if branch.HasCommitsToPush() {
return gui.createErrorPanel(gui.Tr.FwdCommitsToPush)
}
@@ -435,7 +433,7 @@ func (gui *Gui) handleCreateResetToBranchMenu() error {
func (gui *Gui) handleRenameBranch() error {
branch := gui.getSelectedBranch()
if branch == nil {
if branch == nil || !branch.IsRealBranch() {
return nil
}
@@ -469,8 +467,7 @@ func (gui *Gui) handleRenameBranch() error {
// I could do an explicit check here for whether the branch is tracking a remote branch
// but if we've selected it we'll already know that via Pullables and Pullables.
// Bit of a hack but I'm lazy.
notTrackingRemote := branch.Pullables == "?"
if notTrackingRemote {
if !branch.IsTrackingRemote() {
return promptForNewName()
}