summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-31 14:08:28 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-31 14:08:28 -0700
commite646a82ce2828d6e8e3a18fe02dd9b3d31478f00 (patch)
tree7c0bb9c9a082af8e09054af6c370935d0aff9f96 /http.c
parent68a6e976a821ebf2b3766efb167fa716cbf8c188 (diff)
parente5a39ad8e67d61f1f7dfb6ef9d9127a8b11da72c (diff)
downloadgit-e646a82ce2828d6e8e3a18fe02dd9b3d31478f00.tar.gz
Merge branch 'bn/http-cookiefile-config' into maint
"http.cookieFile" configuration variable clearly wants a pathname, but we forgot to treat it as such by e.g. applying tilde expansion. * bn/http-cookiefile-config: http: expand http.cookieFile as a path Documentation: config: improve word ordering for http.cookieFile
Diffstat (limited to 'http.c')
-rw-r--r--http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.c b/http.c
index 4304b80ad3..1044f9ba0e 100644
--- a/http.c
+++ b/http.c
@@ -293,7 +293,7 @@ static int http_options(const char *var, const char *value, void *cb)
return git_config_string(&http_proxy_authmethod, var, value);
if (!strcmp("http.cookiefile", var))
- return git_config_string(&curl_cookie_file, var, value);
+ return git_config_pathname(&curl_cookie_file, var, value);
if (!strcmp("http.savecookies", var)) {
curl_save_cookies = git_config_bool(var, value);
return 0;