diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-10-20 22:21:16 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-10-22 21:33:17 +1100 |
| commit | 6388af70acda91bf1bdc9cba9f38dc810f49f9ca (patch) | |
| tree | 1901eb73ccf719c04b99b933a0cc2182e6dd3a0c /pkg/gui/branches_panel.go | |
| parent | 5ee559b89660cb850040ce41fee242514a09ba8b (diff) | |
simplify pull logic
Diffstat (limited to 'pkg/gui/branches_panel.go')
| -rw-r--r-- | pkg/gui/branches_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index 0d20b14fd..d7d972ae7 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -414,7 +414,7 @@ func (gui *Gui) handleFastForward() error { _ = gui.createLoaderPanel(message) if gui.State.Panels.Branches.SelectedLineIdx == 0 { - _ = gui.pullWithMode("ff-only", PullFilesOptions{span: span}) + _ = gui.pullWithLock(PullFilesOptions{span: span, FastForwardOnly: true}) } else { err := gui.GitCommand.WithSpan(span).FastForward(branch.Name, remoteName, remoteBranchName, gui.promptUserForCredential) gui.handleCredentialsPopup(err) |