diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-12-07 21:59:36 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-04 09:07:15 +1100 |
| commit | b4c078d565af69bcb2f46adc20e528e53ae32908 (patch) | |
| tree | 7a336c0169b7eab49765d39f7a0dd5537e919ba2 /pkg/commands/sync.go | |
| parent | 157dd309f75f2ce3c23be53ddd2e4baa49a67321 (diff) | |
WIP
Diffstat (limited to 'pkg/commands/sync.go')
| -rw-r--r-- | pkg/commands/sync.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/commands/sync.go b/pkg/commands/sync.go index 35f258f4b..65a70bd0d 100644 --- a/pkg/commands/sync.go +++ b/pkg/commands/sync.go @@ -37,7 +37,7 @@ func (c *GitCommand) Push(opts PushOpts) error { cmdStr += " " + c.OSCommand.Quote(opts.UpstreamBranch) } - cmdObj := c.NewCmdObjFromStr(cmdStr) + cmdObj := c.NewCmdObj(cmdStr) return c.DetectUnamePass(cmdObj, opts.PromptUserForCredential) } @@ -58,7 +58,7 @@ func (c *GitCommand) Fetch(opts FetchOptions) error { cmdStr = fmt.Sprintf("%s %s", cmdStr, c.OSCommand.Quote(opts.BranchName)) } - cmdObj := c.NewCmdObjFromStr(cmdStr) + cmdObj := c.NewCmdObj(cmdStr) return c.DetectUnamePass(cmdObj, func(question string) string { if opts.PromptUserForCredential != nil { return opts.PromptUserForCredential(question) @@ -94,18 +94,18 @@ func (c *GitCommand) Pull(opts PullOptions) error { // setting GIT_SEQUENCE_EDITOR to ':' as a way of skipping it, in case the user // has 'pull.rebase = interactive' configured. - cmdObj := c.NewCmdObjFromStr(cmdStr).AddEnvVars("GIT_SEQUENCE_EDITOR=:") + cmdObj := c.NewCmdObj(cmdStr).AddEnvVars("GIT_SEQUENCE_EDITOR=:") return c.DetectUnamePass(cmdObj, opts.PromptUserForCredential) } func (c *GitCommand) FastForward(branchName string, remoteName string, remoteBranchName string, promptUserForCredential func(string) string) error { cmdStr := fmt.Sprintf("git fetch %s %s:%s", c.OSCommand.Quote(remoteName), c.OSCommand.Quote(remoteBranchName), c.OSCommand.Quote(branchName)) - cmdObj := c.NewCmdObjFromStr(cmdStr) + cmdObj := c.NewCmdObj(cmdStr) return c.DetectUnamePass(cmdObj, promptUserForCredential) } func (c *GitCommand) FetchRemote(remoteName string, promptUserForCredential func(string) string) error { cmdStr := fmt.Sprintf("git fetch %s", c.OSCommand.Quote(remoteName)) - cmdObj := c.NewCmdObjFromStr(cmdStr) + cmdObj := c.NewCmdObj(cmdStr) return c.DetectUnamePass(cmdObj, promptUserForCredential) } |