diff --git a/pkg/commands/git_commands/sync.go b/pkg/commands/git_commands/sync.go index fd7584aea..d049deb07 100644 --- a/pkg/commands/git_commands/sync.go +++ b/pkg/commands/git_commands/sync.go @@ -49,10 +49,13 @@ func (self *SyncCommands) Push(task gocui.Task, opts PushOpts) error { return cmdObj.Run() } +func (self *SyncCommands) fetchCommandBuilder(fetchAll bool) *GitCommandBuilder { + return NewGitCmd("fetch"). + ArgIf(fetchAll, "--all") +} + func (self *SyncCommands) FetchCmdObj(task gocui.Task) oscommands.ICmdObj { - cmdArgs := NewGitCmd("fetch"). - ArgIf(self.UserConfig.Git.FetchAll, "--all"). - ToArgv() + cmdArgs := self.fetchCommandBuilder(self.UserConfig.Git.FetchAll).ToArgv() cmdObj := self.cmd.New(cmdArgs) cmdObj.PromptOnCredentialRequest(task) @@ -64,9 +67,7 @@ func (self *SyncCommands) Fetch(task gocui.Task) error { } func (self *SyncCommands) FetchBackgroundCmdObj() oscommands.ICmdObj { - cmdArgs := NewGitCmd("fetch"). - ArgIf(self.UserConfig.Git.FetchAll, "--all"). - ToArgv() + cmdArgs := self.fetchCommandBuilder(self.UserConfig.Git.FetchAll).ToArgv() cmdObj := self.cmd.New(cmdArgs) cmdObj.DontLog().FailOnCredentialRequest() @@ -104,7 +105,7 @@ func (self *SyncCommands) FastForward( remoteName string, remoteBranchName string, ) error { - cmdArgs := NewGitCmd("fetch"). + cmdArgs := self.fetchCommandBuilder(false). Arg(remoteName). Arg(remoteBranchName + ":" + branchName). ToArgv() @@ -113,7 +114,7 @@ func (self *SyncCommands) FastForward( } func (self *SyncCommands) FetchRemote(task gocui.Task, remoteName string) error { - cmdArgs := NewGitCmd("fetch"). + cmdArgs := self.fetchCommandBuilder(false). Arg(remoteName). ToArgv()