allow fastforwarding the current branch

jesseduffield · Feb 18, 2020 · 66e6369 · 66e6369
1 parent 0f0da9c
commit 66e6369
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
@@ -408,6 +408,11 @@ func (c *GitCommand) Pull(args string, ask func(string) string) error {
 	return c.OSCommand.DetectUnamePass("git pull --no-edit "+args, ask)
 }
 
+// PullWithoutPasswordCheck assumes that the pull will not prompt the user for a password
+func (c *GitCommand) PullWithoutPasswordCheck(args string) error {
+	return c.OSCommand.RunCommand("git pull --no-edit " + args)
+}
+
 // Push pushes to a branch
 func (c *GitCommand) Push(branchName string, force bool, upstream string, args string, ask func(string) string) error {
 	forceFlag := ""

diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
@@ -372,12 +372,19 @@ func (gui *Gui) handleFastForward(g *gocui.Gui, v *gocui.View) error {
 	go func() {
 		_ = gui.createLoaderPanel(gui.g, v, message)
 
-		if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
-			_ = gui.createErrorPanel(gui.g, err.Error())
+		if gui.State.Panels.Branches.SelectedLine == 0 {
+			if err := gui.GitCommand.PullWithoutPasswordCheck("--ff-only"); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
+			_ = gui.refreshSidePanels(gui.g)
 		} else {
-			_ = gui.closeConfirmationPrompt(gui.g, true)
+			if err := gui.GitCommand.FastForward(branch.Name, remoteName, remoteBranchName); err != nil {
+				_ = gui.createErrorPanel(gui.g, err.Error())
+			}
 			_ = gui.RenderSelectedBranchUpstreamDifferences()
 		}
+
+		_ = gui.closeConfirmationPrompt(gui.g, true)
 	}()
 	return nil
 }