mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rc/maint-curl-helper'

Browse Source 
* rc/maint-curl-helper:
  remote-curl: ensure that URLs have a trailing slash
  http: make end_url_with_slash() public
  t5541-http-push: add test for URLs with trailing slash

Conflicts:
	remote-curl.c
This commit is contained in:
Junio C Hamano
2010-05-08 22:37:24 -07:00
parent b7d0da858b d8fab07208
commit 3cc9caadf7
4 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
remote-curl.c
View File

@ -9,7 +9,7 @@
#include "sideband.h"
static struct remote *remote;
static const char *url;
static const char *url; /* always ends with a trailing slash */
struct options {
int verbosity;
@ -101,7 +101,7 @@ static struct discovery* discover_refs(const char *service)
return last;
free_discovery(last);
strbuf_addf(&buffer, "%s/info/refs", url);
strbuf_addf(&buffer, "%sinfo/refs", url);
if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
is_http = 1;
if (!strchr(url, '?'))
@ -120,7 +120,7 @@ static struct discovery* discover_refs(const char *service)
strbuf_reset(&buffer);
proto_git_candidate = 0;
strbuf_addf(&buffer, "%s/info/refs", url);
strbuf_addf(&buffer, "%sinfo/refs", url);
refs_url = strbuf_detach(&buffer, NULL);
http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
@ -511,7 +511,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
rpc->out = client.out;
strbuf_init(&rpc->result, 0);
strbuf_addf(&buf, "%s/%s", url, svc);
strbuf_addf(&buf, "%s%s", url, svc);
rpc->service_url = strbuf_detach(&buf, NULL);
strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc);
@ -800,11 +800,13 @@ int main(int argc, const char **argv)
remote = remote_get(argv[1]);
if (argc > 2) {
url = argv[2];
end_url_with_slash(&buf, argv[2]);
} else {
url = remote->url[0];
end_url_with_slash(&buf, remote->url[0]);
}
url = strbuf_detach(&buf, NULL);
http_init(remote);
do {