summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-01 17:21:01 -0500
committerJeff King <peff@peff.net>2015-12-01 17:21:01 -0500
commit712a12e50612ec594d9cc4235a9e0825a50d3097 (patch)
treeea8fac4e7a0221e0900b50eab9473184d88ddb57 /http.c
parent76fdb0640e4a3b305e1d1eaf9d9c3726cd9f7128 (diff)
parentbf9acba2c121ff0e2ac5b61018f23bc56bbde542 (diff)
downloadgit-712a12e50612ec594d9cc4235a9e0825a50d3097.tar.gz
Merge branch 'cb/ssl-config-pathnames' into maint
Allow tilde-expansion in some http config variables. * cb/ssl-config-pathnames: http: treat config options sslCAPath and sslCAInfo as paths
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 f0a5c05bc7..c29ce81ccc 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;