X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git.c;h=50a14013c5a87fed200df0a5a4ec6db0f1e2c223;hb=a3c75056dc73661a6cdab180659f52cdb03b357c;hp=8de48107e0dced316704c1ad78569ccb9eeebb08;hpb=4682693e9ccc04252d0fad6f5627fc056abcdbba;p=git.git

diff --git a/git.c b/git.c
index 8de48107e..50a14013c 100644
--- a/git.c
+++ b/git.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
-#include "exec_cmd.h"
 #include "cache.h"
+#include "exec_cmd.h"
+#include "help.h"
 #include "quote.h"
 #include "run-command.h"
 
@@ -56,9 +57,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 +135,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 {