From 90e87b017f93fc606e2d6956766b32e56b4a9a2e Mon Sep 17 00:00:00 2001
From: Knut Franke <k.franke@science-computing.de>
Date: Mon, 30 Aug 2010 15:39:38 +0200
Subject: Allow core.askpass to override SSH_ASKPASS.

Modify handling of the 'core.askpass' option so that it has the same effect as
GIT_ASKPASS also if SSH_ASKPASS is set.

Signed-off-by: Knut Franke <k.franke@science-computing.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 connect.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'connect.c')

diff --git a/connect.c b/connect.c
index e296bfca18..3450cabd0e 100644
--- a/connect.c
+++ b/connect.c
@@ -629,7 +629,8 @@ char *git_getpass(const char *prompt)
 	askpass = getenv("GIT_ASKPASS");
 	if (!askpass)
 		askpass = askpass_program;
-
+	if (!askpass)
+		askpass = getenv("SSH_ASKPASS");
 	if (!askpass || !(*askpass))
 		return getpass(prompt);
 
-- 
cgit v1.2.3