1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-30 09:16:47 +02:00

explicitly return newlines to our live command stdin

This commit is contained in:
Jesse Duffield 2018-12-18 22:23:17 +11:00
parent 865c7c2332
commit 20a94447d7
4 changed files with 5 additions and 12 deletions

View File

@ -41,10 +41,7 @@ func RunCommandWithOutputLiveWrapper(c *OSCommand, command string, output func(s
scanner.Split(scanWordsWithNewLines)
for scanner.Scan() {
toOutput := strings.Trim(scanner.Text(), " ")
toWrite := output(toOutput)
if len(toWrite) > 0 {
_, _ = ptmx.WriteString(toWrite + "\n")
}
_, _ = ptmx.WriteString(output(toOutput))
}
}()

View File

@ -266,7 +266,7 @@ func (c *GitCommand) Fetch(unamePassQuestion func(string) string, canAskForCrede
if canAskForCredentials {
return unamePassQuestion(question)
}
return "-"
return "\n"
})
}

View File

@ -1045,7 +1045,7 @@ func TestGitCommandPush(t *testing.T) {
gitCmd := newDummyGitCommand()
gitCmd.OSCommand.command = s.command
err := gitCmd.Push("test", s.forcePush, func(passOrUname string) string {
return "-"
return "\n"
})
s.test(err)
})

View File

@ -30,15 +30,11 @@ func (gui *Gui) waitForPassUname(g *gocui.Gui, currentView *gocui.View, passOrUn
// wait for username/passwords input
userInput := <-gui.credentials
return userInput
return userInput + "\n"
}
func (gui *Gui) handleSubmitCredential(g *gocui.Gui, v *gocui.View) error {
message := gui.trimmedContent(v)
if message == "" {
// sending an obviously incorrect password so that the program isn't stuck waiting
message = "-"
}
gui.credentials <- message
err := gui.refreshFiles(g)
if err != nil {
@ -70,7 +66,7 @@ func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error {
return err
}
gui.credentials <- "-"
gui.credentials <- ""
return gui.switchFocus(g, nil, gui.getFilesView(g))
}