summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-05-15 21:26:02 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-05-15 21:41:23 +1000
commit1c259f69f670a7d910b85065aa630223f50bf796 (patch)
tree029244ce31053df2851acd6ae62a34ed2cc10f19 /pkg/gui
parent913f17ee3e2c74dac354005d0ee446ae4a6eab52 (diff)
check if user has configured to push to current by default
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/files_panel.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 36665fe3c..2500fdf97 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -497,9 +497,13 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
}
}
- return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranch.Name, func(g *gocui.Gui, v *gocui.View) error {
- return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v), "")
- })
+ if gui.GitCommand.PushToCurrent {
+ return gui.pushWithForceFlag(g, v, false, "", "--set-upstream")
+ } else {
+ return gui.createPromptPanel(g, v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranch.Name, func(g *gocui.Gui, v *gocui.View) error {
+ return gui.pushWithForceFlag(g, v, false, gui.trimmedContent(v), "")
+ })
+ }
} else if currentBranch.Pullables == "0" {
return gui.pushWithForceFlag(g, v, false, "", "")
}