summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-10-14 07:40:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-16 04:18:36 (GMT)
commitdeba49377b717d1e26c342f65c7f5e75a2db8641 (patch)
tree2750a54dc827a61ec64d362a791b3936f6cf6e97 /http.h
parent070b4dd5899927cb399b8ae9d75cad1fce537429 (diff)
downloadgit-deba49377b717d1e26c342f65c7f5e75a2db8641.zip
git-deba49377b717d1e26c342f65c7f5e75a2db8641.tar.gz
git-deba49377b717d1e26c342f65c7f5e75a2db8641.tar.bz2
http_init: accept separate URL parameter
The http_init function takes a "struct remote". Part of its initialization procedure is to look at the remote's url and grab some auth-related parameters. However, using the url included in the remote is: - wrong; the remote-curl helper may have a separate, unrelated URL (e.g., from remote.*.pushurl). Looking at the remote's configured url is incorrect. - incomplete; http-fetch doesn't have a remote, so passes NULL. So http_init never gets to see the URL we are actually going to use. - cumbersome; http-push has a similar problem to http-fetch, but actually builds a fake remote just to pass in the URL. Instead, let's just add a separate URL parameter to http_init, and all three callsites can pass in the appropriate information. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.h')
-rw-r--r--http.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.h b/http.h
index 0bf8592..3c332a9 100644
--- a/http.h
+++ b/http.h
@@ -86,7 +86,7 @@ extern void add_fill_function(void *data, int (*fill)(void *));
extern void step_active_slots(void);
#endif
-extern void http_init(struct remote *remote);
+extern void http_init(struct remote *remote, const char *url);
extern void http_cleanup(void);
extern int data_received;