go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

Revert "Fix flakey pull_merge_conflict test"

Browse Source 
This reverts commit 90613056ce, 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
This commit is contained in:
Jesse Duffield
2023-07-24 21:09:59 +10:00
parent 57bb1aa698
commit c4e27bf96c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/oscommands/cmd_obj_runner.go
View File

@ -312,8 +312,10 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest(
return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) { return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) {
tr := io.TeeReader(handler.stdoutPipe, cmdWriter) tr := io.TeeReader(handler.stdoutPipe, cmdWriter)
go utils.Safe(func() {
self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask()) self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask())
}) })
})
} }
func (self *cmdObjRunner) processOutput( func (self *cmdObjRunner) processOutput(