diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2021-10-24 10:43:48 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-10-30 18:26:06 +1100 |
commit | f704707d291387b2c1d7432c7700fb5398432f18 (patch) | |
tree | 4d9a54fbfb789af24f49e215f70b7bfe664f1616 /pkg/commands/sync.go | |
parent | 01d82749b17cd7a048d69c8386044d79548f7893 (diff) |
stream output from certain git commands in command log panel
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 3f94c5f4e..35f258f4b 100644 --- a/pkg/commands/sync.go +++ b/pkg/commands/sync.go @@ -38,7 +38,7 @@ func (c *GitCommand) Push(opts PushOpts) error { } cmdObj := c.NewCmdObjFromStr(cmdStr) - return c.OSCommand.DetectUnamePass(cmdObj, opts.PromptUserForCredential) + return c.DetectUnamePass(cmdObj, opts.PromptUserForCredential) } type FetchOptions struct { @@ -59,7 +59,7 @@ func (c *GitCommand) Fetch(opts FetchOptions) error { } cmdObj := c.NewCmdObjFromStr(cmdStr) - return c.OSCommand.DetectUnamePass(cmdObj, func(question string) string { + return c.DetectUnamePass(cmdObj, func(question string) string { if opts.PromptUserForCredential != nil { return opts.PromptUserForCredential(question) } @@ -95,17 +95,17 @@ 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=:") - return c.OSCommand.DetectUnamePass(cmdObj, opts.PromptUserForCredential) + 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) - return c.OSCommand.DetectUnamePass(cmdObj, promptUserForCredential) + 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) - return c.OSCommand.DetectUnamePass(cmdObj, promptUserForCredential) + return c.DetectUnamePass(cmdObj, promptUserForCredential) } |