summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:15 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:15 -0700
commit963838402a94e7fcbd1a73019f80aff708972af8 (patch)
treedfc5a1a62cfd83d5e199974ace5725d5a7fe6946 /http-push.c
parent7f8a9387fd28b1cc4029bb8a8d66cd577d8dd1e3 (diff)
parentdeba49377b717d1e26c342f65c7f5e75a2db8641 (diff)
downloadgit-963838402a94e7fcbd1a73019f80aff708972af8.tar.gz
Merge branch 'jk/http-auth'
* jk/http-auth: http_init: accept separate URL parameter http: use hostname in credential description http: retry authentication failures for all http requests remote-curl: don't retry auth failures with dumb protocol improve httpd auth tests url: decode buffers that are not NUL-terminated
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/http-push.c b/http-push.c
index 44f814cda2..5d01be9344 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1747,7 +1747,6 @@ int main(int argc, char **argv)
int i;
int new_refs;
struct ref *ref, *local_refs;
- struct remote *remote;
git_extract_argv0_path(argv[0]);
@@ -1821,14 +1820,7 @@ int main(int argc, char **argv)
memset(remote_dir_exists, -1, 256);
- /*
- * Create a minimum remote by hand to give to http_init(),
- * primarily to allow it to look at the URL.
- */
- remote = xcalloc(sizeof(*remote), 1);
- ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
- remote->url[remote->url_nr++] = repo->url;
- http_init(remote);
+ http_init(NULL, repo->url);
#ifdef USE_CURL_MULTI
is_running_queue = 0;