summaryrefslogtreecommitdiffstats
path: root/pkg/gui/files_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-12-31 10:04:32 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-04 09:07:15 +1100
commit9c4a8196834d40c9b054d957dcfb69851edcb61f (patch)
treeb71abe0e59e4ee8c9aed19741e11be01dc976fdd /pkg/gui/files_panel.go
parent38bc48312e3c4d65235e9392a8a7d35c9bdab031 (diff)
refactor sync test
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r--pkg/gui/files_panel.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index aa2f78447..30d0cb8b9 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -736,12 +736,11 @@ func (gui *Gui) push(opts pushOpts) error {
}
go utils.Safe(func() {
err := gui.GitCommand.WithSpan(gui.Tr.Spans.Push).Push(commands.PushOpts{
- Force: opts.force,
- UpstreamRemote: opts.upstreamRemote,
- UpstreamBranch: opts.upstreamBranch,
- SetUpstream: opts.setUpstream,
- PromptUserForCredential: gui.promptUserForCredential,
- })
+ Force: opts.force,
+ UpstreamRemote: opts.upstreamRemote,
+ UpstreamBranch: opts.upstreamBranch,
+ SetUpstream: opts.setUpstream,
+ }, gui.promptUserForCredential)
if err != nil && !opts.force && strings.Contains(err.Error(), "Updates were rejected") {
forcePushDisabled := gui.UserConfig.Git.DisableForcePushing