[PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable

From: Junio C Hamano <gitster@pobox.com>
To: Mark Lodato <lodatom@gmail.com>
Cc: git@vger.kernel.org, "Kyle J. McKay" <mackyle@gmail.com>
Subject: [PATCH] http.c: fix parsing of http.sslCertPasswordProtected variable
Date: Fri, 12 Jul 2013 11:52:47 -0700	[thread overview]
Message-ID: <7v38rjlif4.fsf@alter.siamese.dyndns.org> (raw)

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 92aba59..37986f8 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.2-942-gc84dfcb
