From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 456773CF21A for ; Mon, 8 Jun 2026 10:15:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780913702; cv=none; b=KSZpmzr+HzL3XL0wytz7nYC8ytK8eU/7gVOh4043VERYek6dlmFI+HOUhZ1213St3xmsbfTc1xXwJDEd2WH0GOzlSCuRmyP3/PWw+6YoinNR42m4ehwur5cSU8XZ0qQSeISKGSC9buLAm5yOvCVuS8RrT2WNo5eUY49/ealcyFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780913702; c=relaxed/simple; bh=JaSTENrd+7lDX6vN8uEONyXF4DfZHGXoeRsXBzGKqV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pS+ziTakNftsXMlHglEq5dSlh4/hGxyhDPJPI9Qm/NbUk1ewosDGT8XVyqByjVHFEyP3BqJoGeVSXO7orLGEatleVNQO/h/pkT75L9pfttURz3z4gl9G1TNJmC8ynPH4ioMw2AsBvDmhJ9W86g8utJ8d6kcc+DHGOV+N8l5wcJA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P7wVvMpH; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P7wVvMpH" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-490b2b037d2so36094415e9.3 for ; Mon, 08 Jun 2026 03:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780913699; x=1781518499; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EOV8MNo39fOIFccyi0U8VR137DAA1BDgZw/Wt3V4uvo=; b=P7wVvMpHs7iU3D5QxphPsBvYtW0bM+Wc8aZBnCoHNC7uer3laoly2IJNHSCWREWsWp skoGXDl2EObjRtAPJVtJx+AO0ybG/TAW5nCTK1FwgWbnWWu/4zJIdDwatG21OMKK98QP zJCbqrVJksAXsZmMw2W/Z3XCqdDrBGsZyaNbafoglLvTMJa5ClPcCuxoyoxqMKa4mhai EWu5tB34JSQEdTD0fZ2al+fVnrBuW4sgKtz1y35t7ka1r6w9LaCi/z/Wq1E2v/EpAEnG 9TPVgCx+e1KT3HNkY3Miqy7d+TUjaV2sE3UwYOr9oWh8HkvGUIw13MZLfESLYkzVdFxt /ZDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780913699; x=1781518499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=EOV8MNo39fOIFccyi0U8VR137DAA1BDgZw/Wt3V4uvo=; b=fKsn2APb3t/AxfcKgm8HWdFA4Sr5/4E/OUU6UeVXgwv7EQCfLi0usYuii3sqDM17+u ps43ZAvsH/qaOT+9cad9I4epI9KYjM0TeHLs16MkvsA3G0kQT9Kw2quQNLPjVKPUHCWI nY/EqtLDcHom1ZiRtnj3xm4CDHhcJv1ZzxhnuVNZPSxzhuT69f21asqeQHxaVuuAFkpv V0et8N5HTXRYXnKRwsVnUkVIDM25uZ2tNrDIGiNXu0Ee/CukZTuuw0dIgtaKhDwEesa0 Z29uB5kLnyM38sPMJzddF1GWUc84C5qdMeCahNaO2rl63jDvPenVMGT8/58gRVug6NPu nv6A== X-Forwarded-Encrypted: i=1; AFNElJ85dd6I56vFMt9gO0vriNaMyRALPJJ1u8N/h/us0RMz58siAUSUCPpNrJQ0VPwLZO+59RY=@vger.kernel.org X-Gm-Message-State: AOJu0YxtzMiwgRC5cDHy31W+xFJJAe9EcznbMidK+ppFgiCWtLylzZGu Yppknt2AHGoD7IJsRYPAY2v5QEYVDx1duRKP1a9hBKBwQd0sR4cmlfAB X-Gm-Gg: Acq92OF0azbMZlM4ZohdFuRpQkv+GPbpQuVRxRv8DNNUS41ojAnYJcLkBGmWIuVe3jK sEIQ+KNZX2GhkuykmRI4t98oNvL8+16iloNwlxUUvWvygxqzagcuNSJiLHWKkyn4h3Yc9TQZSU+ kXrffClIjVjY6N7/qABtrnjOrYFQU4Zcgv5A0AvwOLiIuPsaM+kWlBXa9OnHPA8VD5yvitgkrQa 3aztzYnQmohpiN2YHThj/IPUGWgykrmGWpSAEae4fXy7soSNspT1JxkIgY5tJi6b3ywHHMtKvxN 8NADPpS31mvOlO3j7LDEo0cqpHEkm3IKdEF/TWW6/VBtVk1oZ7/C1Vpjc43fJh5wG2PYtznJms1 rnvCZsjYsLhak8OPSUscjMrTDjRufUU9nHlSIF270gRu6CU6XuNxk8rQFToWuB0mdoUQJTRJsOa kDVAD7uFmSYlN0PvVcZ6LHmDgzKS+A42D3Xws0/1GO4ypOG+lKmBtcEK0PFwr1sFThIn/UigYXV SD8Ah0EdAQtA28WTCGny8djnmhD4a5i+U8rjhuaa4+8+EANxfQd7pSd/M87ECKUpNQcDZM3kRmI 4+ji16KUoBMsY0GnMHUcZiJaXT9WlwbrS8CaFMiDk1FyUpnFurnB7wor+tyEOzgWSQ== X-Received: by 2002:a05:600c:5010:b0:490:4b89:535d with SMTP id 5b1f17b1804b1-490c25af94fmr251189725e9.1.1780913698491; Mon, 08 Jun 2026 03:14:58 -0700 (PDT) Received: from localhost.localdomain ([188.87.4.21]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f0a43e9sm51131949f8f.0.2026.06.08.03.14.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 08 Jun 2026 03:14:58 -0700 (PDT) From: Pablo Sabater To: eric.peijian@gmail.com Cc: calvinwan@google.com, chriscool@tuxfamily.org, git@vger.kernel.org, jltobler@gmail.com, jonathantanmy@google.com, karthik.188@gmail.com, toon@iotcl.com, chandrapratap3519@gmail.com, Pablo Sabater Subject: [PATCH GSoC RFC v12 09/12] transport: add client support for object-info Date: Mon, 8 Jun 2026 12:14:32 +0200 Message-ID: <20260608-ps-eric-work-rebase-v12-9-5338b766e658@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608-ps-eric-work-rebase-v12-0-5338b766e658@gmail.com> References: <20250221190451.12536-1-eric.peijian@gmail.com> <20260608-ps-eric-work-rebase-v12-0-5338b766e658@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit From: Calvin Wan Sometimes, it is beneficial to retrieve information about an object without downloading it entirely. The server-side logic for this functionality was implemented in commit "a2ba162cda (object-info: support for retrieving object info, 2021-04-20)." And the wire format is documented at https://git-scm.com/docs/protocol-v2#_object_info. This commit introduces client functions to interact with the server. Currently, the client supports requesting a list of object IDs with the 'size' feature from a v2 server. If the server does not advertise this feature (i.e., transfer.advertiseobjectinfo is set to false), the client will return an error and exit. Notice that the entire request is written into req_buf before being sent to the remote. This approach follows the pattern used in the `send_fetch_request()` logic within fetch-pack.c. Streaming the request is not addressed in this patch. Helped-by: Jonathan Tan Helped-by: Christian Couder Signed-off-by: Calvin Wan Signed-off-by: Eric Ju Signed-off-by: Pablo Sabater --- Makefile | 1 + fetch-object-info.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fetch-object-info.h | 22 ++++++++++++++ fetch-pack.c | 3 ++ fetch-pack.h | 2 ++ meson.build | 1 + transport-helper.c | 11 +++++-- transport.c | 28 ++++++++++++++++- transport.h | 11 +++++++ 9 files changed, 163 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b31ecb0756..45453e03c5 100644 --- a/Makefile +++ b/Makefile @@ -1159,6 +1159,7 @@ LIB_OBJS += ewah/ewah_rlw.o LIB_OBJS += exec-cmd.o LIB_OBJS += fetch-negotiator.o LIB_OBJS += fetch-pack.o +LIB_OBJS += fetch-object-info.o LIB_OBJS += fmt-merge-msg.o LIB_OBJS += fsck.o LIB_OBJS += fsmonitor.o diff --git a/fetch-object-info.c b/fetch-object-info.c new file mode 100644 index 0000000000..51a898430d --- /dev/null +++ b/fetch-object-info.c @@ -0,0 +1,87 @@ +#include "git-compat-util.h" +#include "gettext.h" +#include "hex.h" +#include "pkt-line.h" +#include "connect.h" +#include "oid-array.h" +#include "odb.h" +#include "fetch-object-info.h" +#include "string-list.h" + +/* Sends git-cat-file object-info command and its arguments into the request buffer. */ +static void send_object_info_request(const int fd_out, struct object_info_args *args) +{ + struct strbuf req_buf = STRBUF_INIT; + + write_command_and_capabilities(&req_buf, "object-info", args->server_options); + + if (unsorted_string_list_has_string(args->object_info_options, "size")) + packet_buf_write(&req_buf, "size"); + + if (args->oids) + for (size_t i = 0; i < args->oids->nr; i++) + packet_buf_write(&req_buf, "oid %s", oid_to_hex(&args->oids->oid[i])); + + packet_buf_flush(&req_buf); + if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0) + die_errno(_("unable to write request to remote")); + + strbuf_release(&req_buf); +} + +int fetch_object_info(const enum protocol_version version, struct object_info_args *args, + struct packet_reader *reader, struct object_info *object_info_data, + const int stateless_rpc, const int fd_out) +{ + int size_index = -1; + + switch (version) { + case protocol_v2: + if (!server_supports_v2("object-info")) + die(_("object-info capability is not enabled on the server")); + send_object_info_request(fd_out, args); + break; + case protocol_v1: + case protocol_v0: + die(_("unsupported protocol version. expected v2")); + case protocol_unknown_version: + BUG("unknown protocol version"); + } + + for (size_t i = 0; i < args->object_info_options->nr; i++) { + if (packet_reader_read(reader) != PACKET_READ_NORMAL) { + check_stateless_delimiter(stateless_rpc, reader, "stateless delimiter expected"); + return -1; + } + + if (!string_list_has_string(args->object_info_options, reader->line)) + return -1; + + if (!strcmp(reader->line, "size")) { + size_index = i; + for (size_t j = 0; j < args->oids->nr; j++) + object_info_data[j].sizep = xcalloc(1, sizeof(*object_info_data[j].sizep)); + } + } + + for (size_t i = 0; packet_reader_read(reader) == PACKET_READ_NORMAL && i < args->oids->nr; i++) { + struct string_list object_info_values = STRING_LIST_INIT_DUP; + + string_list_split(&object_info_values, reader->line, " ", -1); + if (0 <= size_index) { + if (!strcmp(object_info_values.items[1 + size_index].string, "")) + die("object-info: server does not recognize object %s", + object_info_values.items[0].string); + + if (strtoul_ul(object_info_values.items[1 + size_index].string, 10, object_info_data[i].sizep)) + die("object-info: ref %s has invalid size %s", + object_info_values.items[0].string, + object_info_values.items[1 + size_index].string); + } + + string_list_clear(&object_info_values, 0); + } + check_stateless_delimiter(stateless_rpc, reader, "stateless delimiter expected"); + + return 0; +} diff --git a/fetch-object-info.h b/fetch-object-info.h new file mode 100644 index 0000000000..d35284bd6b --- /dev/null +++ b/fetch-object-info.h @@ -0,0 +1,22 @@ +#ifndef FETCH_OBJECT_INFO_H +#define FETCH_OBJECT_INFO_H + +#include "pkt-line.h" +#include "protocol.h" +#include "odb.h" + +struct object_info_args { + struct string_list *object_info_options; + const struct string_list *server_options; + struct oid_array *oids; +}; + +/* + * Sends git-cat-file object-info command into the request buf and read the + * results from packets. + */ +int fetch_object_info(enum protocol_version version, struct object_info_args *args, + struct packet_reader *reader, struct object_info *object_info_data, + int stateless_rpc, int fd_out); + +#endif /* FETCH_OBJECT_INFO_H */ diff --git a/fetch-pack.c b/fetch-pack.c index cdebd3476f..a86c93fc52 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1742,6 +1742,9 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, if (args->depth > 0 || args->deepen_since || args->deepen_not) args->deepen = 1; + if (args->object_info) + state = FETCH_SEND_REQUEST; + while (state != FETCH_DONE) { switch (state) { case FETCH_CHECK_LOCAL: diff --git a/fetch-pack.h b/fetch-pack.h index 6d0dec7f41..5a428f11ed 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -16,6 +16,7 @@ struct fetch_pack_args { const struct string_list *deepen_not; struct list_objects_filter_options filter_options; const struct string_list *server_options; + struct object_info *object_info_data; /* * If not NULL, during packfile negotiation, fetch-pack will send "have" @@ -43,6 +44,7 @@ struct fetch_pack_args { unsigned reject_shallow_remote:1; unsigned deepen:1; unsigned refetch:1; + unsigned object_info:1; /* * Indicate that the remote of this request is a promisor remote. The diff --git a/meson.build b/meson.build index 064fe2e2f1..7b7dec5949 100644 --- a/meson.build +++ b/meson.build @@ -347,6 +347,7 @@ libgit_sources = [ 'exec-cmd.c', 'fetch-negotiator.c', 'fetch-pack.c', + 'fetch-object-info.c', 'fmt-merge-msg.c', 'fsck.c', 'fsmonitor.c', diff --git a/transport-helper.c b/transport-helper.c index 20a6ea8f81..4adb73bfbc 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -727,8 +727,8 @@ static int fetch_refs(struct transport *transport, /* * If we reach here, then the server, the client, and/or the transport - * helper does not support protocol v2. --negotiate-only requires - * protocol v2. + * helper does not support protocol v2. --negotiate-only and cat-file + * remote-object-info require protocol v2. */ if (data->transport_options.acked_commits) { warning(_("--negotiate-only requires protocol v2")); @@ -744,6 +744,13 @@ static int fetch_refs(struct transport *transport, free_refs(dummy); } + /* fail the command explicitly to avoid further commands input. */ + if (transport->smart_options->object_info) + die(_("remote-object-info requires protocol v2")); + + if (!data->get_refs_list_called) + get_refs_list_using_list(transport, 0); + count = 0; for (i = 0; i < nr_heads; i++) if (!(to_fetch[i]->status & REF_STATUS_UPTODATE)) diff --git a/transport.c b/transport.c index 0f5ec30247..7d3246e12b 100644 --- a/transport.c +++ b/transport.c @@ -9,6 +9,7 @@ #include "hook.h" #include "pkt-line.h" #include "fetch-pack.h" +#include "fetch-object-info.h" #include "remote.h" #include "connect.h" #include "send-pack.h" @@ -467,8 +468,33 @@ static int fetch_refs_via_pack(struct transport *transport, args.negotiation_restrict_tips = data->options.negotiation_restrict_tips; args.negotiation_include_tips = data->options.negotiation_include_tips; args.reject_shallow_remote = transport->smart_options->reject_shallow; + args.object_info = transport->smart_options->object_info; + + if (transport->smart_options->object_info + && transport->smart_options->object_info_oids->nr > 0) { + struct packet_reader reader; + struct object_info_args obj_info_args = { 0 }; + + obj_info_args.server_options = transport->server_options; + obj_info_args.oids = transport->smart_options->object_info_oids; + obj_info_args.object_info_options = transport->smart_options->object_info_options; + string_list_sort(obj_info_args.object_info_options); + + connect_setup(transport, 0); + packet_reader_init(&reader, data->fd[0], NULL, 0, + PACKET_READ_CHOMP_NEWLINE | + PACKET_READ_GENTLE_ON_EOF | + PACKET_READ_DIE_ON_ERR_PACKET); + + data->version = discover_version(&reader); + transport->hash_algo = reader.hash_algo; + + ret = fetch_object_info(data->version, &obj_info_args, &reader, + data->options.object_info_data, transport->stateless_rpc, + data->fd[1]); + goto cleanup; - if (!data->finished_handshake) { + } else if (!data->finished_handshake) { int i; int must_list_refs = 0; for (i = 0; i < nr_heads; i++) { diff --git a/transport.h b/transport.h index 7e5867cffa..bd60b10af4 100644 --- a/transport.h +++ b/transport.h @@ -6,6 +6,7 @@ #include "list-objects-filter-options.h" #include "string-list.h" #include "connect.h" +#include "odb.h" struct git_transport_options { unsigned thin : 1; @@ -31,6 +32,12 @@ struct git_transport_options { */ unsigned connectivity_checked:1; + /* + * Transport will attempt to retrieve only object-info. + * If object-info is not supported, the operation will error and exit. + */ + unsigned object_info : 1; + int depth; const char *deepen_since; const struct string_list *deepen_not; @@ -55,6 +62,10 @@ struct git_transport_options { * common commits to this oidset instead of fetching any packfiles. */ struct oidset *acked_commits; + + struct oid_array *object_info_oids; + struct object_info *object_info_data; + struct string_list *object_info_options; }; enum transport_family { -- 2.54.0