mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 17:13:55 +01:00
Code

Allow core.askpass to override SSH_ASKPASS.

Browse Source 
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>
This commit is contained in:
Knut Franke 2010-08-30 15:39:38 +02:00 committed by Junio C Hamano
parent d3e7da8979
commit 90e87b017f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
connect.c
View File

@ -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);

3
git.c
View File

@ -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] != '-')