summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-11 20:26:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-11 20:26:59 (GMT)
commit17b1e1d76c581cfbd4a83a38136b5efef0dc7aa4 (patch)
treedf168ab6c5e09cc7f1785331d0364bba70842a1a /http.c
parente72ecd324c54675ddf20ecb7b303ad5ec88f6301 (diff)
parent8d1549643e814d2f8f0de2991d69c1331c8181d7 (diff)
downloadgit-17b1e1d76c581cfbd4a83a38136b5efef0dc7aa4.zip
git-17b1e1d76c581cfbd4a83a38136b5efef0dc7aa4.tar.gz
git-17b1e1d76c581cfbd4a83a38136b5efef0dc7aa4.tar.bz2
Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths'
The http.{sslkey,sslCert} configuration variables are to be interpreted as a pathname that honors "~[username]/" prefix, but weren't, which has been fixed. * jc/http-sslkey-and-ssl-cert-are-paths: http.c: http.sslcert and http.sslkey are both pathnames
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 c6c010f..76ff63c 100644
--- a/http.c
+++ b/http.c
@@ -272,10 +272,10 @@ static int http_options(const char *var, const char *value, void *cb)
if (!strcmp("http.sslversion", var))
return git_config_string(&ssl_version, var, value);
if (!strcmp("http.sslcert", var))
- return git_config_string(&ssl_cert, var, value);
+ return git_config_pathname(&ssl_cert, var, value);
#if LIBCURL_VERSION_NUM >= 0x070903
if (!strcmp("http.sslkey", var))
- return git_config_string(&ssl_key, var, value);
+ return git_config_pathname(&ssl_key, var, value);
#endif
#if LIBCURL_VERSION_NUM >= 0x070908
if (!strcmp("http.sslcapath", var))