summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorKnut Franke <k.franke@science-computing.de>2010-08-30 13:39:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-31 17:49:17 (GMT)
commit90e87b017f93fc606e2d6956766b32e56b4a9a2e (patch)
tree8e2354192958d13e376a56a575db5f9f198b45be /git.c
parentd3e7da8979f6ee3edd88fe53241095921d578285 (diff)
downloadgit-90e87b017f93fc606e2d6956766b32e56b4a9a2e.zip
git-90e87b017f93fc606e2d6956766b32e56b4a9a2e.tar.gz
git-90e87b017f93fc606e2d6956766b32e56b4a9a2e.tar.bz2
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>
Diffstat (limited to 'git.c')
-rw-r--r--git.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/git.c b/git.c
index 1753811..19a93fb 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] != '-')