Jeff King <peff@xxxxxxxx> writes:
> diff --git a/prompt.c b/prompt.c
> index e5b4938..8181eeb 100644
> --- a/prompt.c
> +++ b/prompt.c
> @@ -57,11 +57,19 @@ char *git_prompt(const char *prompt, int flags)
> r = do_askpass(askpass, prompt);
> }
>
> - if (!r)
> - r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
> if (!r) {
> - /* prompts already contain ": " at the end */
> - die("could not read %s%s", prompt, strerror(errno));
> + const char *err;
> +
> + if (git_env_bool("GIT_TERMINAL_PROMPT", 1)) {
> + r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
> + err = strerror(errno);
> + } else {
> + err = "terminal prompts disabled";
> + }
> + if (!r) {
> + /* prompts already contain ": " at the end */
> + die("could not read %s%s", prompt, err);
> + }
> }
> return r;
> }
I wish this covered a lot more than just this part from an
end-user's point of view, but this is definitely one of the most
important code paths the mechanism should cover.
Thanks, will queue.
--
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