[PATCH v5 1/5] http.c: fix parsing of http.sslCertPasswordProtected variable
- From
Kyle J. McKay <mackyle@gmail.com>
- Date
- Jul 15, 2013, 09:50 UTC
- Message-ID
- <49c213ce55978a1a655d8ea0d851974@f74d39fa044aa309eaea14b9f57fe79>
- In-Reply-To
- <506e5f642a838b95e0dd5b1f0fa1cfe@f74d39fa044aa309eaea14b9f57fe79>
From: Junio C Hamano <gitster@pobox.com>
The existing code triggers only when the configuration variable is set to true. Once the variable is set to true in a more generic configuration file (e.g. ~/.gitconfig), it cannot be overriden to false in the repository specific one (e.g. .git/config).
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/http.c b/http.c index 2d086ae..e65661e 100644 --- a/http.c +++ b/http.c @@ -160,8 +160,7 @@ static int http_options(const char *var, const char *value, void *cb) if (!strcmp("http.sslcainfo", var)) return git_config_string(&ssl_cainfo, var, value); if (!strcmp("http.sslcertpasswordprotected", var)) { - if (git_config_bool(var, value)) - ssl_cert_password_required = 1; + ssl_cert_password_required = git_config_bool(var, value); return 0; } if (!strcmp("http.ssltry", var)) {
-- 1.8.3