From: Sven Strickroth <sven.strickroth@tu-clausthal.de>
Date: Tue, 18 Dec 2012 00:28:47 +0000 (+0100)
Subject: perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
X-Git-Tag: v1.8.1.1~25^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f3cab2b4d7b6da8b69eea730e5774dcb208c50f?hp=--cc

perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

If GIT_ASKPASS environment variable is not set, git-svn does not try to use
SSH_ASKPASS as git-core does. This change adds a fallback to SSH_ASKPASS.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

8f3cab2b4d7b6da8b69eea730e5774dcb208c50f
diff --git a/perl/Git.pm b/perl/Git.pm
index 72e93c7e1b..8dfca65454 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -515,8 +515,8 @@ sub version {
 
 Query user C<PROMPT> and return answer from user.
 
-Honours GIT_ASKPASS environment variable for querying
-the user. If no GIT_ASKPASS variable is set or an error occoured,
+Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
+the user. If no *_ASKPASS variable is set or an error occoured,
 the terminal is tried as a fallback.
 
 =cut
@@ -527,6 +527,9 @@ sub prompt {
 	if (exists $ENV{'GIT_ASKPASS'}) {
 		$ret = _prompt($ENV{'GIT_ASKPASS'}, $prompt);
 	}
+	if (!defined $ret && exists $ENV{'SSH_ASKPASS'}) {
+		$ret = _prompt($ENV{'SSH_ASKPASS'}, $prompt);
+	}
 	if (!defined $ret) {
 		print STDERR $prompt;
 		STDERR->flush;