undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-curl: send the refs to fetch-pack on stdin

Browse Source 
Now that we can throw an arbitrary number of refs at fetch-pack using
its --stdin option, we use it in the remote-curl helper to bypass the
OS command line length limit.

Signed-off-by: Ivan Todoroski <grnch@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ivan Todoroski 2012-04-02 17:14:44 +02:00 committed by Junio C Hamano
parent 078b895fef
commit 8150749da1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
remote-curl.c
View File

@ -290,6 +290,7 @@ static void output_refs(struct ref *refs)
struct rpc_state { struct rpc_state {
const char *service_name; const char *service_name;
const char **argv; const char **argv;
struct strbuf *stdin_preamble;
char *service_url; char *service_url;
char *hdr_content_type; char *hdr_content_type;
char *hdr_accept; char *hdr_accept;
@ -535,6 +536,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
{ {
const char *svc = rpc->service_name; const char *svc = rpc->service_name;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strbuf *preamble = rpc->stdin_preamble;
struct child_process client; struct child_process client;
int err = 0; int err = 0;
@ -545,6 +547,8 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
client.argv = rpc->argv; client.argv = rpc->argv;
if (start_command(&client)) if (start_command(&client))
exit(1); exit(1);
if (preamble)
write_or_die(client.in, preamble->buf, preamble->len);
if (heads) if (heads)
write_or_die(client.in, heads->buf, heads->len); write_or_die(client.in, heads->buf, heads->len);
@ -626,13 +630,14 @@ static int fetch_git(struct discovery *heads,
int nr_heads, struct ref **to_fetch) int nr_heads, struct ref **to_fetch)
{ {
struct rpc_state rpc; struct rpc_state rpc;
struct strbuf preamble = STRBUF_INIT;
char *depth_arg = NULL; char *depth_arg = NULL;
const char **argv;
int argc = 0, i, err; int argc = 0, i, err;
const char *argv[15];
argv = xmalloc((15 + nr_heads) * sizeof(char*));
argv[argc++] = "fetch-pack"; argv[argc++] = "fetch-pack";
argv[argc++] = "--stateless-rpc"; argv[argc++] = "--stateless-rpc";
argv[argc++] = "--stdin";
argv[argc++] = "--lock-pack"; argv[argc++] = "--lock-pack";
if (options.followtags) if (options.followtags)
argv[argc++] = "--include-tag"; argv[argc++] = "--include-tag";
@ -651,24 +656,27 @@ static int fetch_git(struct discovery *heads,
argv[argc++] = depth_arg; argv[argc++] = depth_arg;
} }
argv[argc++] = url; argv[argc++] = url;
argv[argc++] = NULL;
for (i = 0; i < nr_heads; i++) { for (i = 0; i < nr_heads; i++) {
struct ref *ref = to_fetch[i]; struct ref *ref = to_fetch[i];
if (!ref->name || !*ref->name) if (!ref->name || !*ref->name)
die("cannot fetch by sha1 over smart http"); die("cannot fetch by sha1 over smart http");
argv[argc++] = ref->name; packet_buf_write(&preamble, "%s\n", ref->name);
} }
argv[argc++] = NULL; packet_buf_flush(&preamble);
memset(&rpc, 0, sizeof(rpc)); memset(&rpc, 0, sizeof(rpc));
rpc.service_name = "git-upload-pack", rpc.service_name = "git-upload-pack",
rpc.argv = argv; rpc.argv = argv;
rpc.stdin_preamble = &preamble;
rpc.gzip_request = 1; rpc.gzip_request = 1;
err = rpc_service(&rpc, heads); err = rpc_service(&rpc, heads);
if (rpc.result.len) if (rpc.result.len)
safe_write(1, rpc.result.buf, rpc.result.len); safe_write(1, rpc.result.buf, rpc.result.len);
strbuf_release(&rpc.result); strbuf_release(&rpc.result);
free(argv); strbuf_release(&preamble);
free(depth_arg); free(depth_arg);
return err; return err;
} }