public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: "brian m. carlson" <sandals@crustytoothpaste•net>,
	Jonathan Nieder <jrnieder@gmail•com>,
	git@vger•kernel.org
Subject: Re: [PATCH 2/2] prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
Date: Thu, 04 Dec 2014 10:24:09 -0800	[thread overview]
Message-ID: <xmqqy4qntgs6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20141204035228.GB21492@peff.net> (Jeff King's message of "Wed, 3 Dec 2014 22:52:29 -0500")

Jeff King <peff@peff•net> 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.

next prev parent reply	other threads:[~2014-12-04 18:24 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-03  0:03 Disabling credential helper? brian m. carlson
2014-12-03  0:59 ` Jonathan Nieder
2014-12-03  1:21   ` Jeff King
2014-12-03  1:29     ` Jonathan Nieder
2014-12-03  1:36       ` Jeff King
2014-12-04  1:33         ` Jeff King
2014-12-04  6:07           ` Junio C Hamano
2014-12-03 17:14     ` Junio C Hamano
2014-12-04  0:42     ` brian m. carlson
2014-12-04  3:42       ` [PATCH 0/2] disabling terminal prompts Jeff King
2014-12-04  3:46         ` [PATCH 1/2] credential: let helpers tell us to quit Jeff King
2014-12-04  3:52         ` [PATCH 2/2] prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts Jeff King
2014-12-04 18:24           ` Junio C Hamano [this message]
2014-12-04 21:01             ` Jeff King
2014-12-04 21:33               ` Junio C Hamano
2014-12-05  9:10                 ` Jeff King
2014-12-05 17:37                   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqy4qntgs6.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jrnieder@gmail$(echo .)com \
    --cc=peff@peff$(echo .)net \
    --cc=sandals@crustytoothpaste$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox