| Message ID | 6ac0c8e105febe526dc64182845832297656a8a5.1705411391.git.zhiyou.jx@alibaba-inc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | support remote archive via stateless transport | expand |
Jiang Xin <worldhello.net@gmail.com> writes: > From: Jiang Xin <zhiyou.jx@alibaba-inc.com> > > 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. This will fix the exit code of git-archive s/will fix/fixes > in test case "archive remote http repository" of t5003. > > 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 and a service like "git-upload-archive", the > remote helper may receive a SIGPIPE signal and exit early. OK. > To have a > graceful disconnect method by calling do_take_over() will solve this > issue. How about rewording to Call do_take_over() to have a graceful disconnect method, so that we still call transport_disconnect() even if the remote helper exits early. to make "this issue" more explicit? > Helped-by: Linus Arver <linusa@google.com> > Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> > --- > t/t5003-archive-zip.sh | 2 +- > transport-helper.c | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh > index 6f85bd3463..961c6aac25 100755 > --- a/t/t5003-archive-zip.sh > +++ b/t/t5003-archive-zip.sh > @@ -268,7 +268,7 @@ test_expect_success 'remote archive does not work with protocol v1' ' > ' > > test_expect_success 'archive remote http repository' ' > - test_must_fail git archive --remote="$HTTPD_URL/auth/smart/bare.git" \ > + git archive --remote="$HTTPD_URL/auth/smart/bare.git" \ > --output=remote-http.zip HEAD && > test_cmp_bin d.zip remote-http.zip > ' > diff --git a/transport-helper.c b/transport-helper.c > index 6fe9f4f208..91381be622 100644 > --- a/transport-helper.c > +++ b/transport-helper.c > @@ -669,6 +669,8 @@ static int connect_helper(struct transport *transport, const char *name, > > fd[0] = data->helper->out; > fd[1] = data->helper->in; > + > + do_take_over(transport); > return 0; > } > > -- > 2.43.0
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 6f85bd3463..961c6aac25 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -268,7 +268,7 @@ test_expect_success 'remote archive does not work with protocol v1' ' ' test_expect_success 'archive remote http repository' ' - test_must_fail git archive --remote="$HTTPD_URL/auth/smart/bare.git" \ + git archive --remote="$HTTPD_URL/auth/smart/bare.git" \ --output=remote-http.zip HEAD && test_cmp_bin d.zip remote-http.zip ' diff --git a/transport-helper.c b/transport-helper.c index 6fe9f4f208..91381be622 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -669,6 +669,8 @@ static int connect_helper(struct transport *transport, const char *name, fd[0] = data->helper->out; fd[1] = data->helper->in; + + do_take_over(transport); return 0; }