summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-08 16:17:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-08 16:17:01 (GMT)
commitb815a726e9da97924b44d551b10d3fef3b3d1885 (patch)
treea1d0fe2b25ce93d7e1e4aad225b551018d3ca22e /git.c
parente250c5914fd151caf228cbda6c30560c266bcfef (diff)
parent453842c9b81c6bb1328b0dfc351745615004a77f (diff)
downloadgit-b815a726e9da97924b44d551b10d3fef3b3d1885.zip
git-b815a726e9da97924b44d551b10d3fef3b3d1885.tar.gz
git-b815a726e9da97924b44d551b10d3fef3b3d1885.tar.bz2
Merge branch 'kf/askpass-config'
* kf/askpass-config: Extend documentation of core.askpass and GIT_ASKPASS. Allow core.askpass to override SSH_ASKPASS. Add a new option 'core.askpass'.
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 d64ab1a..ce4bcfe 100644
--- a/git.c
+++ b/git.c
@@ -56,9 +56,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] != '-')