From b04038d08f3afb9210d43cfd4c9d95b073fd7a59 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 30 Jan 2022 11:01:32 +1100
Subject: [PATCH] no need to invoke sync controller here

---
 pkg/gui/branches_panel.go | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index 95a754030..e524ef9a2 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -306,12 +306,29 @@ func (gui *Gui) handleFastForward() error {
 	)
 
 	return gui.c.WithLoaderPanel(message, func() error {
-		gui.c.LogAction(action)
-		err := gui.git.Sync.FastForward(branch.Name, branch.UpstreamRemote, branch.UpstreamBranch)
-		if err != nil {
-			_ = gui.c.Error(err)
+		if gui.State.Panels.Branches.SelectedLineIdx == 0 {
+			gui.c.LogAction(action)
+
+			err := gui.git.Sync.Pull(
+				git_commands.PullOptions{
+					RemoteName:      branch.UpstreamRemote,
+					BranchName:      branch.Name,
+					FastForwardOnly: true,
+				},
+			)
+			if err != nil {
+				_ = gui.c.Error(err)
+			}
+
+			return gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
+		} else {
+			gui.c.LogAction(action)
+			err := gui.git.Sync.FastForward(branch.Name, branch.UpstreamRemote, branch.UpstreamBranch)
+			if err != nil {
+				_ = gui.c.Error(err)
+			}
+			_ = gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
 		}
-		_ = gui.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
 
 		return nil
 	})