From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 18:52:47 +0000 (-0700)
Subject: http.c: fix parsing of http.sslCertPasswordProtected variable
X-Git-Tag: v1.8.5-rc0~164^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f4ccd2b0be476dfc3b556c71797712332bae00c?ds=sidebyside;hp=edca4152560522a431a51fc0a06147fc680b5b18

http.c: fix parsing of http.sslCertPasswordProtected variable

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>
---

diff --git a/http.c b/http.c
index 92aba59082..37986f8252 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)) {