X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=connect.c;h=3450cabd0e3281e0eeedeb35d331b95bf95f5afb;hb=442cb08fa0dca38c99cf1ff8a5654a95a5cad7a4;hp=02e738a0146a5c46aaf3f1d8edc3c055a99e98b9;hpb=609eb9f7ff2af45d52ea90c0678a442d46aaa163;p=git.git

diff --git a/connect.c b/connect.c
index 02e738a01..3450cabd0 100644
--- a/connect.c
+++ b/connect.c
@@ -621,13 +621,16 @@ int finish_connect(struct child_process *conn)
 
 char *git_getpass(const char *prompt)
 {
-	char *askpass;
+	const char *askpass;
 	struct child_process pass;
 	const char *args[3];
 	static struct strbuf buffer = STRBUF_INIT;
 
 	askpass = getenv("GIT_ASKPASS");
-
+	if (!askpass)
+		askpass = askpass_program;
+	if (!askpass)
+		askpass = getenv("SSH_ASKPASS");
 	if (!askpass || !(*askpass))
 		return getpass(prompt);