On Wed, Jan 04, 2012 at 09:31:02AM +0100, Sven Strickroth wrote:
> diff --git a/prompt.c b/prompt.c
> index 72ab9de..e791619 100644
> --- a/prompt.c
> +++ b/prompt.c
> @@ -52,9 +52,17 @@ char *git_prompt(const char *prompt, int flags)
> }
>
> r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
> - if (!r)
> - die_errno("could not read '%s'", prompt);
> - return r;
> + if (r)
> + return r;
> +
> + if (flags & PROMPT_ASKPASS) {
> + const char *askpass;
> + askpass = getenv("SSH_ASKPASS");
> + if (askpass && *askpass)
> + return do_askpass(askpass, prompt);
> + }
> +
> + die_errno("could not read '%s'", prompt);
> }
Wouldn't you also have to drop checking of SSH_ASKPASS in the block
right before calling git_terminal_prompt (right before the context in
your patch)?
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html