Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init

diff --git a/http.c b/http.c
index 985b995c1d05b9a1ae461d6056e14e66b39d563c..6fe74d5eeafa0566cc7f19c8024ed0c82b55db77 100644 (file)
--- a/http.c
+++ b/http.c
@@ -294,7 +294,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;