Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-05 Thread Knut Franke
On 2015-11-05 03:24, Jeff King wrote: > There was also some discussion with curl upstream of providing a new > authentication interface, where we would provide curl with > authentication callbacks, and it would trigger them if and when > credentials were needed. Somebody upstream was working on a

[PATCH v4 0/2]

2015-11-04 Thread Knut Franke
Changes in the fourth iteration: * update Documentation/technical/api-remote.txt to reflect the addition to struct remote * update documentation of http.proxy in Documentation/config.txt to mention the possibility of having git fill in missing proxy password * fix decl-after-stmt *

[PATCH 1/2] http: allow selection of proxy authentication method

2015-11-04 Thread Knut Franke
or configuration variables http.proxyAuthmethod and remote..proxyAuthmethod (in analogy to http.proxy and remote..proxy). The following values are supported: * anyauth (default) * basic * digest * negotiate * ntlm Signed-off-by: Knut Franke <k.fra...@science-computing.de> Helped-by: Junio C Hamano

[PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-04 Thread Knut Franke
/https_proxy/all_proxy environment variables, which would otherwise be evaluated as a fallback by curl. Without this, we would have different semantics for git configuration and environment variables. Signed-off-by: Knut Franke <k.fra...@science-computing.de> Helped-by: Junio C Hamano

Re: [PATCH 1/2] http: allow selection of proxy authentication method

2015-11-03 Thread Knut Franke
On 2015-11-02 14:46, Junio C Hamano wrote: > > Reviewed-by: Junio C Hamano > > Reviewed-by: Eric Sunshine > > Please add these only when you are doing the final submission, > sending the same version reviewed by these people after they said > the

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-03 Thread Knut Franke
On 2015-11-02 14:54, Junio C Hamano wrote: > > static void init_curl_proxy_auth(CURL *result) > > { > > + if (proxy_auth.username) { > > + if (!proxy_auth.password) > > + credential_fill(_auth); > > +#if LIBCURL_VERSION_NUM >= 0x071301 > > +

[PATCH v3 0/2]

2015-11-02 Thread Knut Franke
Changes in the third iteration: * don't break support for curl < 7.10.7 * fix some memory leaks * explicitly set anyauth as fallback for unsupported proyx authmethod setting, and tell the user what we did * clean up usage of curl version #ifdefs * fix more code formatting / style / naming

[PATCH 1/2] http: allow selection of proxy authentication method

2015-11-02 Thread Knut Franke
or configuration variables http.proxyAuthmethod and remote..proxyAuthmethod (in analogy to http.proxy and remote..proxy). The following values are supported: * anyauth (default) * basic * digest * negotiate * ntlm Signed-off-by: Knut Franke <k.fra...@science-computing.de> Reviewed-by: Junio C Hamano

[PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-02 Thread Knut Franke
/https_proxy/all_proxy environment variables, which would otherwise be evaluated as a fallback by curl. Without this, we would have different semantics for git configuration and environment variables. Signed-off-by: Knut Franke <k.fra...@science-computing.de> Reviewed-by: Junio C Hamano

Re: [PATCH 1/2] http: allow selection of proxy authentication method

2015-10-30 Thread Knut Franke
Junio C Hamano wrote: > > + if (http_proxy_authmethod) { > > + int i; > > + for (i = 0; i < ARRAY_SIZE(http_proxy_authmethods); i++) { > > + if (!strcmp(http_proxy_authmethod, > > http_proxy_authmethods[i].name)) { > > +

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-10-30 Thread Knut Franke
On 2015-10-28 14:58, Eric Sunshine wrote: > > + } > > + if (!curl_http_proxy) { > > + copy_from_env(_http_proxy, "ALL_PROXY"); > > + copy_from_env(_http_proxy, "all_proxy"); > > + } > > If this sort of upper-

[PATCH 1/2] http: allow selection of proxy authentication method

2015-10-28 Thread Knut Franke
or configuration variables http.proxyAuthmethod and remote..proxyAuthmethod (in analogy to http.proxy and remote..proxy). The following values are supported: * anyauth (default) * basic * digest * negotiate * ntlm Signed-off-by: Knut Franke <k.fra...@science-computing.de> --- Documentation/config.tx

[PATCH 2/2] http: use credential API to handle proxy authentication

2015-10-28 Thread Knut Franke
/https_proxy/all_proxy environment variables, which would otherwise be evaluated as a fallback by curl. Without this, we would have different semantics for git configuration and environment variables. Signed-off-by: Knut Franke <k.fra...@science-computing.de> --- http.

[PATCH v2] http proxy authentication improvements

2015-10-28 Thread Knut Franke
Fixes in the second iteration: * rename http.proxy-authmethod to http.proxyAuthmethod for consistency with other core git variables * issue warning() instead of error() for unsupported authentication method, for consistency with http.sslVersion * fix some code formatting / style issues

Re: [PATCH 1/2] http: allow selection of proxy authentication method

2015-10-27 Thread Knut Franke
On 2015-10-26 13:33, Junio C Hamano wrote: > Call yours "http.proxyAuthmethod" in the documentation, and use > strcmp("http.proxyauthmethod", var) in the options callback code. [...] > Strange indentation here... [...] > Along the same line as how we do sslversions[] instead of a long > if/else

[PATCH 2/2] http: use credential API to handle proxy authentication

2015-10-26 Thread Knut Franke
/https_proxy/all_proxy environment variables, which would otherwise be evaluated as a fallback by curl. Without this, we would have different semantics for git configuration and environment variables. Signed-off-by: Knut Franke <k.fra...@science-computing.de> --- http.

[PATCH 1/2] http: allow selection of proxy authentication method

2015-10-26 Thread Knut Franke
or configuration variables http.proxy-authmethod and remote..proxy-authmethod (in analogy to http.proxy and remote..proxy). The following values are supported: * anyauth (default) * basic * digest * negotiate * ntlm Signed-off-by: Knut Franke <k.fra...@science-computing.de> --- Documentation/config.tx

[PATCH] gitk: Add menu item for reverting commits

2013-04-27 Thread Knut Franke
Sometimes it's helpful (at least psychologically) to have this feature easily accessible. Code borrows heavily from cherrypick. Signed-off-by: Knut Franke knut.fra...@gmx.de --- gitk | 62 ++ 1 file changed, 62 insertions(+) diff