diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:20 (GMT) |
| commit | 86362f7205a31188846de0aed94620c1f0776931 (patch) | |
| tree | 8ad1f4a040a08d15d1514f26b0f8235a3a6fcf35 /credential.c | |
| parent | 2f17ecbd8d58c79e76767da82cf824840dfd367f (diff) | |
| parent | e652c0eb5d772076f92245c7e076bf6aaf6af223 (diff) | |
| download | git-86362f7205a31188846de0aed94620c1f0776931.zip git-86362f7205a31188846de0aed94620c1f0776931.tar.gz git-86362f7205a31188846de0aed94620c1f0776931.tar.bz2 | |
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 'credential.c')
| -rw-r--r-- | credential.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/credential.c b/credential.c index 1886ea5..b146ad8 100644 --- a/credential.c +++ b/credential.c @@ -173,6 +173,8 @@ int credential_read(struct credential *c, FILE *fp) c->path = xstrdup(value); } else if (!strcmp(key, "url")) { credential_from_url(c, value); + } else if (!strcmp(key, "quit")) { + c->quit = !!git_config_bool("quit", value); } /* * Ignore other lines; we don't know what they mean, but @@ -274,6 +276,9 @@ void credential_fill(struct credential *c) credential_do(c, c->helpers.items[i].string, "get"); if (c->username && c->password) return; + if (c->quit) + die("credential helper '%s' told us to quit", + c->helpers.items[i].string); } credential_getpass(c); |