diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-07-24 21:09:59 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-07-24 21:12:03 +1000 |
| commit | c4e27bf96c589a6ce308777f17adf26b837b6ce5 (patch) | |
| tree | 28c3676167ad742bbd34277fb671ce333b6d346e | |
| parent | 57bb1aa69853de458faf886f077dfca9250dc28d (diff) | |
Revert "Fix flakey pull_merge_conflict test"
This reverts commit 90613056cef95fe32d19198d88a0d71f00c5f6ae, or the part that removed
a goroutine at least.
Reverting because this has caused an infinite wait for push/pull on windows.
We'll need to find out why that happens separately
| -rw-r--r-- | pkg/commands/oscommands/cmd_obj_runner.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/commands/oscommands/cmd_obj_runner.go b/pkg/commands/oscommands/cmd_obj_runner.go index 19c67819d..b82e3a25c 100644 --- a/pkg/commands/oscommands/cmd_obj_runner.go +++ b/pkg/commands/oscommands/cmd_obj_runner.go @@ -312,7 +312,9 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest( return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) { tr := io.TeeReader(handler.stdoutPipe, cmdWriter) - self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask()) + go utils.Safe(func() { + self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask()) + }) }) } |