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'.
This commit is contained in:
Junio C Hamano
2010-09-08 09:17:01 -07:00
7 changed files with 26 additions and 5 deletions

3
git.c
View File

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