diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:20 -0800 |
| commit | 86362f7205a31188846de0aed94620c1f0776931 (patch) | |
| tree | 8ad1f4a040a08d15d1514f26b0f8235a3a6fcf35 /Documentation | |
| parent | Merge branch 'dm/compat-s-ifmt-for-zos' (diff) | |
| parent | prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts (diff) | |
| download | tgif-86362f7205a31188846de0aed94620c1f0776931.tar.xz | |
Merge branch 'jk/credential-quit'
Credential helpers are asked in turn until one of them give
positive response, which is cumbersome to turn off when you need to
run Git in an automated setting. The credential helper interface
learned to allow a helper to say "stop, don't ask other helpers."
Also GIT_TERMINAL_PROMPT environment can be set to false to disable
our built-in prompt mechanism for passwords.
* jk/credential-quit:
prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
credential: let helpers tell us to quit
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git.txt | 4 | ||||
| -rw-r--r-- | Documentation/technical/api-credentials.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 73dc0ad0a0..179615195f 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -913,6 +913,10 @@ for further details. and read the password from its STDOUT. See also the 'core.askpass' option in linkgit:git-config[1]. +'GIT_TERMINAL_PROMPT':: + If this environment variable is set to `0`, git will not prompt + on the terminal (e.g., when asking for HTTP authentication). + 'GIT_CONFIG_NOSYSTEM':: Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index c1b42a40d3..e44426dd04 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -248,7 +248,10 @@ FORMAT` in linkgit:git-credential[7] for a detailed specification). For a `get` operation, the helper should produce a list of attributes on stdout in the same format. A helper is free to produce a subset, or even no values at all if it has nothing useful to provide. Any provided -attributes will overwrite those already known about by Git. +attributes will overwrite those already known about by Git. If a helper +outputs a `quit` attribute with a value of `true` or `1`, no further +helpers will be consulted, nor will the user be prompted (if no +credential has been provided, the operation will then fail). For a `store` or `erase` operation, the helper's output is ignored. If it fails to perform the requested operation, it may complain to |