From c4e27bf96c589a6ce308777f17adf26b837b6ce5 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 24 Jul 2023 21:09:59 +1000 Subject: [PATCH] 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 --- pkg/commands/oscommands/cmd_obj_runner.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()) + }) }) }