summaryrefslogtreecommitdiff
path: root/http-fetch.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-10-14 09:40:40 +0200
committerJunio C Hamano <gitster@pobox.com>2011-10-15 21:18:36 -0700
commitdeba49377b717d1e26c342f65c7f5e75a2db8641 (patch)
tree2750a54dc827a61ec64d362a791b3936f6cf6e97 /http-fetch.c
parent070b4dd5899927cb399b8ae9d75cad1fce537429 (diff)
downloadgit-deba49377b717d1e26c342f65c7f5e75a2db8641.tar.gz
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-fetch.c')
-rw-r--r--http-fetch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http-fetch.c b/http-fetch.c
index 3af4c71bd0..e341872a6b 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -63,7 +63,7 @@ int main(int argc, const char **argv)
git_config(git_default_config, NULL);
- http_init(NULL);
+ http_init(NULL, url);
walker = get_http_walker(url);
walker->get_tree = get_tree;
walker->get_history = get_history;