diff options
| author | Jeff King <peff@peff.net> | 2016-02-26 13:51:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 21:58:14 +0300 |
| commit | 24321375cda79f141be72d1a842e930df6f41725 (patch) | |
| tree | cd0e5845a6fba7b3cc32c81d82b75c96643a3a7b /credential.c | |
| parent | 56f37fda511e1615dc6df86c68f3b841711a7828 (diff) | |
credential: let empty credential specs reset helper list
Sine the credential.helper key is a multi-valued config
list, there's no way to "unset" a helper once it's been set.
So if your system /etc/gitconfig sets one, you can never
avoid running it, but only add your own helpers on top.
Since an empty value for credential.helper is nonsensical
(it would just try to run "git-credential-"), we can assume
nobody is using it. Let's define it to reset the helper
list, letting you override lower-priority instances which
have come before.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'credential.c')
| -rw-r--r-- | credential.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/credential.c b/credential.c index 7d6501d190..aa996669fc 100644 --- a/credential.c +++ b/credential.c @@ -63,9 +63,12 @@ static int credential_config_callback(const char *var, const char *value, key = dot + 1; } - if (!strcmp(key, "helper")) - string_list_append(&c->helpers, value); - else if (!strcmp(key, "username")) { + if (!strcmp(key, "helper")) { + if (*value) + string_list_append(&c->helpers, value); + else + string_list_clear(&c->helpers, 0); + } else if (!strcmp(key, "username")) { if (!c->username) c->username = xstrdup(value); } |