fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)

[git.git] / git.c

diff --git a/git.c b/git.c
index 90c6daf153493f70a35c99212a3cf0461f7fb03e..f09948eed952aa14614ad3c17475f63ad02fbc6e 100644 (file)
--- a/git.c
+++ b/git.c
@@ -54,6 +54,9 @@ 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] != '-')