[PATCH 2/3] perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
- From
- Sven Strickroth <sven.strickroth@tu-clausthal.de>
- Date
- Dec 18, 2012, 00:28 UTC
- Message-ID
- <50CFB8BF.4000405@tu-clausthal.de>
- In-Reply-To
- <7vehiol9w2.fsf@alter.siamese.dyndns.org>
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> --- perl/Git.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/perl/Git.pm b/perl/Git.pm index 72e93c7..8dfca65 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -515,8 +515,8 @@ sub html_path { command_oneline('--html-path') } 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;
-- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server