Re: [PATCH 2/2] prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 4, 2014, 18:24 UTC
Message-ID: <xmqqy4qntgs6.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20141204035228.GB21492@peff.net>

Jeff King <peff@peff.net> writes:

Show 28 quoted lines

> 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.