diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2018-05-03 23:46:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-06 04:17:19 (GMT) |
| commit | ba95710a3bdcb2a80495b1d93a0e482dd69905e1 (patch) | |
| tree | 8336ff3d7af8a17c68a144edf627700643a457a2 /fetch-pack.c | |
| parent | 5459268751941a71b32816902698376b7932cec5 (diff) | |
| download | git-ba95710a3bdcb2a80495b1d93a0e482dd69905e1.zip git-ba95710a3bdcb2a80495b1d93a0e482dd69905e1.tar.gz git-ba95710a3bdcb2a80495b1d93a0e482dd69905e1.tar.bz2 | |
{fetch,upload}-pack: support filter in protocol v2
The fetch-pack/upload-pack protocol v2 was developed independently of
the filter parameter (used in partial fetches), thus it did not include
support for it. Add support for the filter parameter.
Like in the legacy protocol, the server advertises and supports "filter"
only if uploadpack.allowfilter is configured.
Like in the legacy protocol, the client continues with a warning if
"--filter" is specified, but the server does not advertise it.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index f93723f..3ed40aa 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1191,14 +1191,29 @@ static int send_fetch_request(int fd_out, const struct fetch_pack_args *args, else if (is_repository_shallow() || args->deepen) die(_("Server does not support shallow requests")); + /* Add filter */ + if (server_supports_feature("fetch", "filter", 0) && + args->filter_options.choice) { + print_verbose(args, _("Server supports filter")); + packet_buf_write(&req_buf, "filter %s", + args->filter_options.filter_spec); + } else if (args->filter_options.choice) { + warning("filtering not recognized by server, ignoring"); + } + /* add wants */ add_wants(wants, &req_buf); - /* Add all of the common commits we've found in previous rounds */ - add_common(&req_buf, common); + if (args->no_dependents) { + packet_buf_write(&req_buf, "done"); + ret = 1; + } else { + /* Add all of the common commits we've found in previous rounds */ + add_common(&req_buf, common); - /* Add initial haves */ - ret = add_haves(&req_buf, haves_to_send, in_vain); + /* Add initial haves */ + ret = add_haves(&req_buf, haves_to_send, in_vain); + } /* Send request */ packet_buf_flush(&req_buf); |