Skip to content

Commit

Permalink
http.c: fix parsing of http.sslCertPasswordProtected variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jul 31, 2013
1 parent edca415 commit 3f4ccd2
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions http.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 3f4ccd2

Please sign in to comment.