fix: output askpass to stderr (#7034)

kylecarbs · web-flow · commit 3ff2ae1b1a23 · 2023-04-06T11:32:43.000-05:00
This fixes askpass not outputting a prompt.
diff --git a/cli/gitaskpass.go b/cli/gitaskpass.go
@@ -51,17 +51,17 @@ func (r *RootCmd) gitAskpass() *clibase.Cmd {
 			}
 			if token.URL != "" {
 				if err := openURL(inv, token.URL); err == nil {
-					cliui.Infof(inv.Stdout, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)
+					cliui.Infof(inv.Stderr, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)
 				} else {
-					cliui.Infof(inv.Stdout, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)
+					cliui.Infof(inv.Stderr, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)
 				}
 
 				for r := retry.New(250*time.Millisecond, 10*time.Second); r.Wait(ctx); {
 					token, err = client.GitAuth(ctx, host, true)
 					if err != nil {
 						continue
 					}
-					cliui.Infof(inv.Stdout, "You've been authenticated with Git!\n")
+					cliui.Infof(inv.Stderr, "You've been authenticated with Git!\n")
 					break
 				}
 			}
diff --git a/cli/gitaskpass_test.go b/cli/gitaskpass_test.go
@@ -86,17 +86,20 @@ func TestGitAskpass(t *testing.T) {
 
 		inv, _ := clitest.New(t, "--agent-url", url, "--no-open", "Username for 'https://github.com':")
 		inv.Environ.Set("GIT_PREFIX", "/")
-		pty := ptytest.New(t)
-		inv.Stdout = pty.Output()
+		stdout := ptytest.New(t)
+		inv.Stdout = stdout.Output()
+		stderr := ptytest.New(t)
+		inv.Stderr = stderr.Output()
 		go func() {
 			err := inv.Run()
 			assert.NoError(t, err)
 		}()
 		<-poll
+		stderr.ExpectMatch("Open the following URL to authenticate")
 		resp.Store(&agentsdk.GitAuthResponse{
 			Username: "username",
 			Password: "password",
 		})
-		pty.ExpectMatch("username")
+		stdout.ExpectMatch("username")
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -51,17 +51,17 @@ func (r RootCmd) gitAskpass() clibase.Cmd {`
`51`	`51`	`}`
`52`	`52`	`if token.URL != "" {`
`53`	`53`	`if err := openURL(inv, token.URL); err == nil {`
`54`		`- cliui.Infof(inv.Stdout, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)`
	`54`	`+ cliui.Infof(inv.Stderr, "Your browser has been opened to authenticate with Git:\n\n\t%s\n\n", token.URL)`
`55`	`55`	`} else {`
`56`		`- cliui.Infof(inv.Stdout, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)`
	`56`	`+ cliui.Infof(inv.Stderr, "Open the following URL to authenticate with Git:\n\n\t%s\n\n", token.URL)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`for r := retry.New(250time.Millisecond, 10time.Second); r.Wait(ctx); {`
`60`	`60`	`token, err = client.GitAuth(ctx, host, true)`
`61`	`61`	`if err != nil {`
`62`	`62`	`continue`
`63`	`63`	`}`
`64`		`- cliui.Infof(inv.Stdout, "You've been authenticated with Git!\n")`
	`64`	`+ cliui.Infof(inv.Stderr, "You've been authenticated with Git!\n")`
`65`	`65`	`break`
`66`	`66`	`}`
`67`	`67`	`}`