diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:33:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:33:43 -0700 |
| commit | 72140a73198b2fdbf6fc83ff679d3f553ed5faed (patch) | |
| tree | 7ba00a7d4b59ad00610ef496d599e08568d4b452 | |
| parent | Merge branch 'jk/ref-filter-colors' into maint (diff) | |
| parent | http.c: http.sslcert and http.sslkey are both pathnames (diff) | |
| download | tgif-72140a73198b2fdbf6fc83ff679d3f553ed5faed.tar.xz | |
Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint
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
| -rw-r--r-- | http.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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)) |