Skip to content

Commit 2174762

Browse files
committed
Inline fetchAux into call site
It's only called from this one place, and the call is a one-liner, so it makes more sense to inline the code there.
1 parent 3577808 commit 2174762

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

pkg/gui/controllers/files_controller.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,21 +1189,17 @@ func (self *FilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error
11891189

11901190
func (self *FilesController) fetch() error {
11911191
return self.c.WithWaitingStatus(self.c.Tr.FetchingStatus, func(task gocui.Task) error {
1192-
return self.fetchAux(task)
1193-
})
1194-
}
1192+
self.c.LogAction("Fetch")
1193+
err := self.c.Git().Sync.Fetch(task)
11951194

1196-
func (self *FilesController) fetchAux(task gocui.Task) (err error) {
1197-
self.c.LogAction("Fetch")
1198-
err = self.c.Git().Sync.Fetch(task)
1199-
1200-
if err != nil && strings.Contains(err.Error(), "exit status 128") {
1201-
return errors.New(self.c.Tr.PassUnameWrong)
1202-
}
1195+
if err != nil && strings.Contains(err.Error(), "exit status 128") {
1196+
return errors.New(self.c.Tr.PassUnameWrong)
1197+
}
12031198

1204-
_ = self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS}, Mode: types.ASYNC})
1199+
_ = self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS}, Mode: types.ASYNC})
12051200

1206-
return err
1201+
return err
1202+
})
12071203
}
12081204

12091205
// Couldn't think of a better term than 'normalised'. Alas.

0 commit comments

Comments
 (0)