From: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
"git archive --remote=<remote>" learned to talk over the smart
http (aka stateless) transport.
range-diff v2...v3
1: 4497404900 = 1: e660fc79b6 transport-helper: no connection restriction in connect_helper
-: ---------- > 2: e3dc18caa9 transport-helper: call do_take_over() in process_connect
2: 9bfaa1a904 ! 3: 01699822c3 transport-helper: run do_take_over in connect_helper
@@ Metadata
Author: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
## Commit message ##
- transport-helper: run do_take_over in connect_helper
+ transport-helper: call do_take_over() in connect_helper
After successfully connecting to the smart transport by calling
- "process_connect_service()" in "connect_helper()", run "do_take_over()"
- to replace the old vtable with a new one which has methods ready for
- the smart transport connection.
+ process_connect_service() in connect_helper(), run do_take_over() to
+ replace the old vtable with a new one which has methods ready for the
+ smart transport connection.
- The subsequent commit introduces remote archive for a stateless-rpc
- connection. But without running "do_take_over()", it may fail to call
- "transport_disconnect()" in "run_remote_archiver()" of
- "builtin/archive.c". This is because for a stateless connection or a
- service like "git-upload-pack-archive", the remote helper may receive a
- SIGPIPE signal and exit early. To have a graceful disconnect method by
- calling "do_take_over()" will solve this issue.
+ The connect_helper() function is used as the connect method of the
+ vtable in "transport-helper.c", and it is called by transport_connect()
+ in "transport.c" to setup a connection. The only place that we call
+ transport_connect() so far is in "builtin/archive.c". Without running
+ do_take_over(), it may fail to call transport_disconnect() in
+ run_remote_archiver() of "builtin/archive.c". This is because for a
+ stateless connection or a service like "git-upload-pack-archive", the
+ remote helper may receive a SIGPIPE signal and exit early. To have a
+ graceful disconnect method by calling do_take_over() will solve this
+ issue.
+
+ The subsequent commit will introduce remote archive over a stateless-rpc
+ connection.
Signed-off-by: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
3: 1e305394ee ! 4: a38ac182d6 archive: support remote archive from stateless transport
@@ Commit message
capabilities when connecting to remote-helper, so do not send them
in "remote-curl.c" for the "git-upload-archive" service.
+ Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
Signed-off-by: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
## http-backend.c ##
@@ http-backend.c: static void check_content_type(struct strbuf *hdr, const char *a
static void service_rpc(struct strbuf *hdr, char *service_name)
{
- const char *argv[] = {NULL, "--stateless-rpc", ".", NULL};
-+ const char *argv[4];
++ struct strvec argv = STRVEC_INIT;
struct rpc_service *svc = select_service(hdr, service_name);
struct strbuf buf = STRBUF_INIT;
-+ if (!strcmp(service_name, "git-upload-archive")) {
-+ argv[1] = ".";
-+ argv[2] = NULL;
-+ } else {
-+ argv[1] = "--stateless-rpc";
-+ argv[2] = ".";
-+ argv[3] = NULL;
-+ }
++ strvec_push(&argv, svc->name);
++ if (strcmp(service_name, "git-upload-archive"))
++ strvec_push(&argv, "--stateless-rpc");
++ strvec_push(&argv, ".");
+
strbuf_reset(&buf);
strbuf_addf(&buf, "application/x-git-%s-request", svc->name);
check_content_type(hdr, buf.buf);
+@@ http-backend.c: static void service_rpc(struct strbuf *hdr, char *service_name)
+
+ end_headers(hdr);
+
+- argv[0] = svc->name;
+- run_service(argv, svc->buffer_input);
++ run_service(argv.v, svc->buffer_input);
+ strbuf_release(&buf);
++ strvec_clear(&argv);
+ }
+
+ static int dead;
@@ http-backend.c: static struct service_cmd {
{"GET", "/objects/pack/pack-[0-9a-f]{64}\\.idx$", get_idx_file},
---
Jiang Xin (4):
transport-helper: no connection restriction in connect_helper
transport-helper: call do_take_over() in process_connect
transport-helper: call do_take_over() in connect_helper
archive: support remote archive from stateless transport
http-backend.c | 15 +++++++++++----
remote-curl.c | 14 +++++++++++---
t/t5003-archive-zip.sh | 30 ++++++++++++++++++++++++++++++
transport-helper.c | 29 +++++++++++++----------------
4 files changed, 65 insertions(+), 23 deletions(-)
--
2.40.1.50.gf560bcc116.dirty
