summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorCharles Bailey <cbailey32@bloomberg.net>2015-11-23 12:02:40 +0000
committerJeff King <peff@peff.net>2015-11-24 18:51:00 -0500
commitbf9acba2c121ff0e2ac5b61018f23bc56bbde542 (patch)
treedea4a20c6b1e2fdddbe776a59e2ec5fb625191b0 /http.c
parent5cb2e162d21fa45a63f186b31970e2e9c9b10ba9 (diff)
downloadgit-bf9acba2c121ff0e2ac5b61018f23bc56bbde542.tar.gz
http: treat config options sslCAPath and sslCAInfo as pathscb/ssl-config-pathnames
This enables ~ and ~user expansion for these config options. Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'http.c')
-rw-r--r--http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/http.c b/http.c
index 0f924a8b48..0bce727f13 100644
--- a/http.c
+++ b/http.c
@@ -215,10 +215,10 @@ static int http_options(const char *var, const char *value, void *cb)
#endif
#if LIBCURL_VERSION_NUM >= 0x070908
if (!strcmp("http.sslcapath", var))
- return git_config_string(&ssl_capath, var, value);
+ return git_config_pathname(&ssl_capath, var, value);
#endif
if (!strcmp("http.sslcainfo", var))
- return git_config_string(&ssl_cainfo, var, value);
+ return git_config_pathname(&ssl_cainfo, var, value);
if (!strcmp("http.sslcertpasswordprotected", var)) {
ssl_cert_password_required = git_config_bool(var, value);
return 0;