Re: [PATCH] http: treat config options sslCAPath and sslCAInfo as paths

2015-11-24 Thread Jeff King
On Mon, Nov 23, 2015 at 12:02:40PM +, char...@hashpling.org wrote:

> From: Charles Bailey 
> 
> This enables ~ and ~user expansion for these config options.

Thanks, this seems like the obviously correct thing to do.

> In the only place that we (optionally) test https specifically, we also
> turn off SSL verification so I couldn't see a sensible way to add an
> automated test.
> 
> The change is fairly simple and I've tested manually and the effects are
> as I expected - I can point to a certificate bundle or directory in my
> home directory using a ~/ prefix in my .gitconfig.

Yeah, I agree that testing such a trivial feature is not worth the
infrastructure it would require adding to the test suite.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] http: treat config options sslCAPath and sslCAInfo as paths

2015-11-23 Thread charles
From: Charles Bailey 

This enables ~ and ~user expansion for these config options.

Signed-off-by: Charles Bailey 
---

In the only place that we (optionally) test https specifically, we also
turn off SSL verification so I couldn't see a sensible way to add an
automated test.

The change is fairly simple and I've tested manually and the effects are
as I expected - I can point to a certificate bundle or directory in my
home directory using a ~/ prefix in my .gitconfig.

 http.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/http.c b/http.c
index 42f29ce..5e37252 100644
--- a/http.c
+++ b/http.c
@@ -214,10 +214,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(_capath, var, value);
+   return git_config_pathname(_capath, var, value);
 #endif
if (!strcmp("http.sslcainfo", var))
-   return git_config_string(_cainfo, var, value);
+   return git_config_pathname(_cainfo, var, value);
if (!strcmp("http.sslcertpasswordprotected", var)) {
ssl_cert_password_required = git_config_bool(var, value);
return 0;
-- 
2.6.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html