summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-07 15:07:35 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-09 14:09:53 +1100
commit3f44eac95b3835bdd00b84aafca9ae0bc80ad7dd (patch)
treee5e7279113d45afb915a9acae79055b79e0d0f9a /pkg/gui
parent946a35b59de44094759fa177c0218837364c9dd7 (diff)
remove repo field
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/files_panel.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 855a8f851..fcf8d021c 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -668,11 +668,11 @@ func (gui *Gui) handlePullFiles() error {
// if we have no upstream branch we need to set that first
if !currentBranch.IsTrackingRemote() {
// see if we have this branch in our config with an upstream
- conf, err := gui.GitCommand.Repo.Config()
+ branches, err := gui.GitCommand.Config.Branches()
if err != nil {
return gui.surfaceError(err)
}
- for branchName, branch := range conf.Branches {
+ for branchName, branch := range branches {
if branchName == currentBranch.Name {
return gui.pullFiles(PullFilesOptions{RemoteName: branch.Remote, BranchName: branch.Name, action: action})
}
@@ -878,12 +878,12 @@ func (gui *Gui) requestToForcePush() error {
}
func (gui *Gui) upstreamForBranchInConfig(branchName string) (string, string, error) {
- conf, err := gui.GitCommand.Repo.Config()
+ branches, err := gui.GitCommand.Config.Branches()
if err != nil {
return "", "", err
}
- for configBranchName, configBranch := range conf.Branches {
+ for configBranchName, configBranch := range branches {
if configBranchName == branchName {
return configBranch.Remote, configBranchName, nil
}