]> asedeno.scripts.mit.edu Git - git.git/blobdiff - git.c
Merge branch 'kf/askpass-config'
[git.git] / git.c
diff --git a/git.c b/git.c
index 8de48107e0dced316704c1ad78569ccb9eeebb08..ce4bcfec03bb4371d01b3f39bf93764eda337ce7 100644 (file)
--- 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] != '-')
@@ -137,7 +134,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
                                fprintf(stderr, "-c expects a configuration string\n" );
                                usage(git_usage_string);
                        }
-                       git_config_parse_parameter((*argv)[1]);
+                       git_config_push_parameter((*argv)[1]);
                        (*argv)++;
                        (*argc)--;
                } else {