diff options
Diffstat (limited to 'remote-curl.c')
-rw-r--r-- | remote-curl.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/remote-curl.c b/remote-curl.c index a76b6405eb..cb0182b582 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -1,22 +1,27 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "environment.h" +#include "gettext.h" +#include "hex.h" #include "remote.h" #include "connect.h" #include "strbuf.h" #include "walker.h" #include "http.h" -#include "exec-cmd.h" #include "run-command.h" #include "pkt-line.h" #include "string-list.h" -#include "sideband.h" #include "strvec.h" #include "credential.h" #include "oid-array.h" #include "send-pack.h" +#include "setup.h" #include "protocol.h" #include "quote.h" +#include "trace2.h" #include "transport.h" +#include "url.h" +#include "write-or-die.h" static struct remote *remote; /* always ends with a trailing slash */ @@ -472,10 +477,11 @@ static struct discovery *discover_refs(const char *service, int for_push) /* * NEEDSWORK: If we are trying to use protocol v2 and we are planning - * to perform a push, then fallback to v0 since the client doesn't know - * how to push yet using v2. + * to perform any operation that doesn't involve upload-pack (i.e., a + * fetch, ls-remote, etc), then fallback to v0 since we don't know how + * to do anything else (like push or remote archive) via v2. */ - if (version == protocol_v2 && !strcmp("git-receive-pack", service)) + if (version == protocol_v2 && strcmp("git-upload-pack", service)) version = protocol_v0; /* Add the extra Git-Protocol header */ @@ -755,7 +761,8 @@ static void check_pktline(struct check_pktline_state *state, const char *ptr, si size -= digits_remaining; if (state->len_filled == 4) { - state->remaining = packet_length(state->len_buf); + state->remaining = packet_length(state->len_buf, + sizeof(state->len_buf)); if (state->remaining < 0) { die(_("remote-curl: bad line length character: %.4s"), state->len_buf); } else if (state->remaining == 2) { @@ -1556,8 +1563,11 @@ int cmd_main(int argc, const char **argv) if (buf.len == 0) break; if (starts_with(buf.buf, "fetch ")) { - if (nongit) - die(_("remote-curl: fetch attempted without a local repo")); + if (nongit) { + setup_git_directory_gently(&nongit); + if (nongit) + die(_("remote-curl: fetch attempted without a local repo")); + } parse_fetch(&buf); } else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) { |