On Tue, Sep 11, 2018 at 10:36 PM Josh Steadmon <stead...@google.com> wrote:
>
> Signed-off-by: Josh Steadmon <stead...@google.com>
> ---
> builtin/archive.c | 8 +++++++-
> http-backend.c | 10 +++++++++-
> transport-helper.c | 5 +++--
> 3 files changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/archive.c b/builtin/archive.c
> index 73831887d..5fa75b3f7 100644
> --- a/builtin/archive.c
> +++ b/builtin/archive.c
> @@ -87,7 +87,13 @@ static int run_remote_archiver(int argc, const char **argv,
> status = packet_reader_read(&reader);
> if (status != PACKET_READ_FLUSH)
> die(_("git archive: expected a flush"));
> - }
> + } else if (version == protocol_v2 &&
> + starts_with(transport->url, "http"))
I assume this is a smart way to cover both http and https
as the latter is prefixed by the former.
How does this interact with remote helpers
(See gitremote-helpers(1), which doesn't mention archives,
but I would imagine that one would be able to use a remote
helper eventually, too?
git archive --remote=abc://example.org/test ....
> + /*
> + * Commands over HTTP require two requests, so there's an
> + * additional server response to parse.
> + */
> + discover_version(&reader);
>
> /* Now, start reading from fd[0] and spit it out to stdout */
> rv = recv_sideband("archive", fd[0], 1);
> diff --git a/http-backend.c b/http-backend.c
> index 458642ef7..d62d583c7 100644
> --- a/http-backend.c
> +++ b/http-backend.c
> @@ -32,6 +32,7 @@ struct rpc_service {
> static struct rpc_service rpc_service[] = {
> { "upload-pack", "uploadpack", 1, 1 },
> { "receive-pack", "receivepack", 0, -1 },
> + { "upload-archive", "uploadarchive", 1, 1 },
So git archives are not supported in protocol v0 via http?
Then it makes sense to see not mention of archives in
the remote helpers as well.
The rest of the code is a surprisingly small patch.
Stefan
