diff options
| author | Luka Markušić <luka.markusic@microblink.com> | 2022-04-13 15:21:01 +0200 |
|---|---|---|
| committer | Luka Markušić <luka.markusic@microblink.com> | 2022-04-13 15:21:01 +0200 |
| commit | c4b958e3fddc0b50900def5b32f9ff4246d22a5d (patch) | |
| tree | b7a007095dd20b75bc29bef98ad7eb7c9ce69bdd /pkg/gui/controllers/sync_controller.go | |
| parent | f83308c8df529e5a50332ff68a7e7c5106cea414 (diff) | |
There's gotta be a better way for initial content
Diffstat (limited to 'pkg/gui/controllers/sync_controller.go')
| -rw-r--r-- | pkg/gui/controllers/sync_controller.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/controllers/sync_controller.go b/pkg/gui/controllers/sync_controller.go index 046edb369..9eb4ae16a 100644 --- a/pkg/gui/controllers/sync_controller.go +++ b/pkg/gui/controllers/sync_controller.go @@ -79,7 +79,7 @@ func (self *SyncController) push(currentBranch *models.Branch) error { if self.git.Config.GetPushToCurrent() { return self.pushAux(pushOpts{setUpstream: true}) } else { - return self.helpers.Upstream.PromptForUpstream(currentBranch, func(upstream string) error { + return self.helpers.Upstream.PromptForUpstreamWithInitialContent(currentBranch, func(upstream string) error { upstreamRemote, upstreamBranch, err := self.helpers.Upstream.ParseUpstream(upstream) if err != nil { return self.c.Error(err) @@ -100,7 +100,7 @@ func (self *SyncController) pull(currentBranch *models.Branch) error { // if we have no upstream branch we need to set that first if !currentBranch.IsTrackingRemote() { - return self.helpers.Upstream.PromptForUpstream(currentBranch, func(upstream string) error { + return self.helpers.Upstream.PromptForUpstreamWithInitialContent(currentBranch, func(upstream string) error { if err := self.setCurrentBranchUpstream(upstream); err != nil { return self.c.Error(err) } |