summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 11:52:47 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-31 12:09:13 -0700
commit3f4ccd2b0be476dfc3b556c71797712332bae00c (patch)
tree499975364a61c5997c5d6c19e7bd399201c0d416
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-3f4ccd2b0be476dfc3b556c71797712332bae00c.tar.gz
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>
-rw-r--r--http.c3
1 files changed, 1 insertions, 2 deletions
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)) {