git/http.c, branch v1.5.6.4

http.c: Use 'git_config_string' to clean up SSL config.

2008-07-06T00:42:46Z

Signed-off-by: Brian Hetro Signed-off-by: Junio C Hamano

Work around gcc warnings from curl headers

2008-07-04T07:37:40Z

After master.k.org upgrade, I started seeing these warning messages: transport.c: In function 'get_refs_via_curl': transport.c:458: error: call to '_curl_easy_setopt_err_write_callback' declared with attribute warning: curl_easy_setopt expects a curl_write_callback argument for this option It appears that the curl header wants to enforce the function signature for callback function given to curl_easy_setopt() to be compatible with that of (*curl_write_callback) or fwrite. This patch seems to work the issue around. Signed-off-by: Junio C Hamano

Don't allocate too much memory in quote_ref_url

2008-06-14T19:53:09Z

In c13b263, http_fetch_ref got "refs/" included in the ref passed to it, which, incidentally, makes the allocation in quote_ref_url too big, now. Signed-off-by: Junio C Hamano

Provide git_config with a callback-data parameter

2008-05-14T19:34:44Z

git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Make ls-remote http://... list HEAD, like for git://...

2008-04-27T00:36:18Z

This makes a struct ref able to represent a symref, and makes http.c able to recognize one, and makes transport.c look for "HEAD" as a ref in the list, and makes it dereference symrefs for the resulting ref, if any. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

Make walker.fetch_ref() take a struct ref.

2008-04-27T00:36:17Z

This simplifies a few things, makes a few things slightly more complicated, but, more importantly, allows that, when struct ref can represent a symref, http_fetch_ref() can return one. Incidentally makes the string that http_fetch_ref() gets include "refs/" (if appropriate), because that's how the name field of struct ref works. As far as I can tell, the usage in walker:interpret_target() wouldn't have worked previously, if it ever would have been used, which it wouldn't (since the fetch process uses the hash instead of the name of the ref there). Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-03-04T08:34:39Z

* maint: Fix 'git remote show' regression on empty repository in 1.5.4 Fix incorrect wording in git-merge.txt. git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options Fix random crashes in http_cleanup()

Fix random crashes in http_cleanup()

2008-03-03T21:36:44Z

For some reason, http_cleanup was running all active slots, which could lead in situations where a freed slot would be accessed in fill_active_slots. OTOH, we are cleaning up, which means the caller doesn't care about pending requests. Just forget about them instead or running them. Signed-off-by: Mike Hommey Signed-off-by: Junio C Hamano

Set proxy override with http_init()

2008-02-27T23:37:57Z

In transport.c, proxy setting (the one from the remote conf) was set through curl_easy_setopt() call, while http.c already does the same with the http.proxy setting. We now just use this infrastructure instead, and make http_init() now take the struct remote as argument so that it can take the http_proxy setting from there, and any other property that would be added later. At the same time, we make get_http_walker() take a struct remote argument too, and pass it to http_init(), which makes remote defined proxy be used for more than get_refs_via_curl(). We leave out http-fetch and http-push, which don't use remotes for the moment, purposefully. Signed-off-by: Mike Hommey Acked-by: Daniel Barkalow Signed-off-by: Junio C Hamano

http.c: guard config parser from value=NULL

2008-02-11T21:11:37Z

http.sslcert and friends expect a string value Signed-off-by: Junio C Hamano