From 90e87b017f93fc606e2d6956766b32e56b4a9a2e Mon Sep 17 00:00:00 2001 From: Knut Franke Date: Mon, 30 Aug 2010 15:39:38 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- connect.c | 3 ++- git.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/connect.c b/connect.c index e296bfca1..3450cabd0 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); diff --git a/git.c b/git.c index 17538117a..19a93fb9a 100644 --- a/git.c +++ b/git.c @@ -55,9 +55,6 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) { int handled = 0; - if (!getenv("GIT_ASKPASS") && getenv("SSH_ASKPASS")) - setenv("GIT_ASKPASS", getenv("SSH_ASKPASS"), 1); - while (*argc > 0) { const char *cmd = (*argv)[0]; if (cmd[0] != '-') -- 2.30.2