From patchwork Fri Feb 21 19:04:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986171 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 DF1E91FBC86 for ; Fri, 21 Feb 2025 19:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164718; cv=none; b=UU8ZbNIPrR1QHORymusvEIJb7pwS3xqaycPGK1u7DfZFVXTxFbuz2+k7G5fXKi983WuOyH/e5hwMnMvxPyhvm0WKESS+g8kzmPK3lHltqt65dtGvhNb7qp8uj98XltRkKZlhL1ExeL5qCfdDdM1bPk4zUDZlqp164Tr+J6hPTro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164718; c=relaxed/simple; bh=jQf39Zuct+wR4JW6z6LITQkvpypWwxrl1DeWf6MugmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G+pAP0mHsW+KIVJmr+62z2cqQw7a+n1mSPmLMPqeEJ9eSAr5UrIS4L/2MaVNz/7OdKBGUjUuue5s4UwDNhMCT45Bwu1ZlzIM/dSY00tYlElfvh0QJdO4CvDvDjjbAKR6XC1YY14xOGDRdFL0LObp6wMfyz/qGFnqKmTwB/YvnP0= 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=ccyP6WjS; arc=none smtp.client-ip=209.85.160.182 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="ccyP6WjS" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-471f686642cso22403981cf.2 for ; Fri, 21 Feb 2025 11:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164715; x=1740769515; 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=jjKdvZ0evTbbux/sZbbtdsfx2tL2kKqY33qgkar+st0=; b=ccyP6WjS+I4DnhzAk4RnEJelDUcXbkwWLfnFEpkVeivLFccwS2JjMdR8sRm0esTsUO ODJeDxyn+Y5lafX4CtIKEhtfsjnnQ+iFnjro4LKiMXeS216ZQAPF7Em1/OP485UWxqEy EPWe/DWAXe8vLYuqYWFyEZvNTHiPxUhJwuCeJL2jybnW5x1FWayeDJCde/8UBwso1/zd EMUtgWLrBDaKuMh6ORLyyY9HvGnL/8sMZY56dugQWhFwCIWj+B0SpKRwrN1zr72cmdqS 1bCNFMJgQwNXMncZrvFLQDtXXuqu+bV7T7CGk7XtDA5u4cD5lJDbT6jpDD5Ee9qkXYfZ 3/DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164715; x=1740769515; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jjKdvZ0evTbbux/sZbbtdsfx2tL2kKqY33qgkar+st0=; b=UixGqOrfLzZgnDXrWAYls8e2Q1RDI/XjsEixjFP1T3R8hFULYopR6qT1XgRvchMygG 8ZasJZfx+LyzHUl7kL/4hTlyEPYVLqBspxWvqBQO4uW1Fi6c5h5cxAobXjvZVzLYsV98 0GG50wKr+Cyk2k9QVM1CxEZu7ocX5QWO0gzBlusV26MLNjfF6Wbtv38Rt47XQOB7Cczr UghtAtTnVhTXDAFj/8NZc4N/rwUl5fFuAQgbNAlB2NMSuw/1GF7H4hieNkk/bYlp/5Bw BWQrnea9cB3kbZO324avol3fYOrmTYTYdYcbR+P8b9fyAEr6S1TFUpAa/nbTKmyo8PdS jnEg== X-Gm-Message-State: AOJu0Yza3a1G0JQjC86x+OtBJev5c4xJcnDPT13+WfQsREgyQSnwGkxi EepYfGBDvT15ntHnPmZPBkMWF8Lkng6KBUFPbE8FTizUIBmlQZtftREsS+S0zVQ= X-Gm-Gg: ASbGncuIq/QgD79gACA2UF8IXMkeFEG5iA+f3wMelyyZcpXGTv1uKcLBy6GRGpM5wMa lMsRlJLWgLU18boGIZj1Zt89pFyDFY2rpqTRB9H1jS32wYyxR54R0TuXB5eK33Wpq5sLM7iL0bR TWYEOwaflYG6dv0oKtfKy5ePO5U/O+Yh9XEl8cINaaw1HE8i2EwwNkpLPtIndZaCYrhPpR0TdLv +TOpi3+eCoP11Lvdt2gnoZZ8loaDvTn5AOAtnFEwCZdO1bVtWIG7jQ6DJhD/eG3w/UWzJfXeU6e LRUtyq0RR3vrJl43Tq9fkHzmv088TTPsbuBs5VkahlTAOoKESzy8 X-Google-Smtp-Source: AGHT+IFrCdkkStz+TTNoPWfg6sTBNkZWtVk6i0Ha9Ppi9N4TsN3oigJhYlBcTN1Z8NaITwQLMsIsXQ== X-Received: by 2002:a05:622a:4891:b0:472:dff:37f0 with SMTP id d75a77b69052e-4722491e991mr52792641cf.45.1740164715677; Fri, 21 Feb 2025 11:05:15 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:15 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 1/8] git-compat-util: add strtoul_ul() with error handling Date: Fri, 21 Feb 2025 14:04:42 -0500 Message-ID: <20250221190451.12536-2-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We already have strtoul_ui() and similar functions that provide proper error handling using strtoul from the standard library. However, there isn't currently a variant that returns an unsigned long. This commit introduces strtoul_ul() to address this gap, enabling the return of an unsigned long with proper error handling. --- git-compat-util.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h index e123288e8f..0e9a43351a 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1353,6 +1353,26 @@ static inline int strtoul_ui(char const *s, int base, unsigned int *result) return 0; } +/* + * Convert a string to an unsigned long using the standard library's strtoul, + * with additional error handling to ensure robustness. + */ +static inline int strtoul_ul(char const *s, int base, unsigned long *result) +{ + unsigned long ul; + char *p; + + errno = 0; + /* negative values would be accepted by strtoul */ + if (strchr(s, '-')) + return -1; + ul = strtoul(s, &p, base); + if (errno || *p || p == s ) + return -1; + *result = ul; + return 0; +} + static inline int strtol_i(char const *s, int base, int *result) { long ul; From patchwork Fri Feb 21 19:04:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986172 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 D10F01FE478 for ; Fri, 21 Feb 2025 19:05:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164719; cv=none; b=MlrHpXrsmMcaipxZmS4P5+sHAb+AKBlJwdbJPxQamPszDmrXO81fb6sgThm1tnNCTvH7ixstMURUiBCqRaBPYLh1qDsTBJ0vvfhUyf44+6ky9d3Rnc00xoXM78wRp4uB62OMXL9P/CHlRePzn1OrRcRpd5+0EZVovXaXKfU2EQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164719; c=relaxed/simple; bh=SjEnCrPrm4Qv2ChtweqKFDdVkF6Z6tpZKoj0tRMLrls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EGwtJ4E/0w9D1+Yx5GjHKHfhGnQE1uVEkfT10Dzn+qcBIA8/vTKkQE4M5N+VGv4yITIZIk5okZFglYNEP8sEA6Du7eVUbjNqJwLD/hYJEbCVCyMtOL5aTKyK/l5OhkFjKEomfe3ygnozpJ0eyJg6vwZ2v3zZQ6sCmyGcFk9TwjQ= 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=RgWI7Ncc; arc=none smtp.client-ip=209.85.160.182 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="RgWI7Ncc" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-46c8474d8f6so22130061cf.3 for ; Fri, 21 Feb 2025 11:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164716; x=1740769516; 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=b83FKPkXpJYK0zzWmboTAHheqaybnwW+PnOPiPNB0C0=; b=RgWI7NccTZkU1wxucojrSwSPjp67PJRUnSm8IabF3HEv1Ei7yafl0RVqk/IN3JiDwM Ujm9AI17ZJsZz5gsnlSguOFXY5Y0PNeHkti1mLFtrOi9ySaY0TboKYj4e2Dj8slAnS0s RUo8emmXZmhm9Hbdardve93/vunahCcOKQkazw9xApKV5/5cabnCsOUVj717w005xo3B THM66ePXxUd6lkVFKipDQ7Qzp2eJU42pBpoDsqX7VrRzoWwHMTLgZWyWaPntd8h6NZov iF8y3YS5C9Nt1JmwCBCbq8KaOESnYUL8cbfptUrHcc91Ti4UmkOyzWMpCEjpWBQyn/aQ OM8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164716; x=1740769516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b83FKPkXpJYK0zzWmboTAHheqaybnwW+PnOPiPNB0C0=; b=uhmEiUDkby290+PkhH9uVhnlwxMByRl4nbKjCEZVb4Vm1kKa35ZQWpYre16RgNEIzB c/AFRz6fNMHc+x5TKNnEZmZQQE/3vRLpn4oeg0mI6gO1Dxx2KtxQzIuSbjerFV3z/TCt UpZN+aPO4JGXMqdPGH+MvJ2s8k/KzjmjWob1Z/SyNMKhBGhXUSu7pDEIfLhISG80dW0h zXlb0GDGHZvEEfu8fkVjpeWqFUy1AzbGWLJtoLBhAY05CZ4lCFiVL4MER/8VnyOczeT5 zjWE2ltVeXEahFcZ3aEmieNshJmqPKjA487Yh6CQyw+R/ALq3zeITtt3ULUJfUPW95mx p3QQ== X-Gm-Message-State: AOJu0YxpL26sUVRXbtDUxQcOVEDQNYvbN5UoOhTVIDScdruxOw1hmizy 4m4vxAG/NkMYCwThtGsuSLhA89L1EmqpbaZzOGClt26m4MGe76jNthl/U2WNrPE= X-Gm-Gg: ASbGncshmAGWHyZ3ly1/GUkkoOX/MjYm1fN0YYpuVyzVl2SQhFU9L30qGl/+CFaol0J iAnSTlMu33CelMirdBChdAEy2xijoKT4vVeTZ7ePQwjsx3X9m+R4U17LdLRsUcfjCrH0XXZVfl7 ITnZgYePu/+S7e2Qd73gNz0Q7eOmUFt1uMjU3TtmHv4Iz4iAB8Mh/HTYNI3UdDwjpHoQLlbJSXB kPJSy592l5Yq+GXvt76YIPsUiIkjzjIvk2GZpiIopSxROydVFurq/J8NIYd9TsjuGoEp+dQ0n2t FdIrVK5heNqGLeaR3KOBJGkkTvEgkmfqAaZLJ6fmTR9SPNH9xDoj X-Google-Smtp-Source: AGHT+IFq9bXsT7gzLqKZn35JBKuqbIlNSFzNoiLJjKOZMLajH8veY64XdWEANx6J5d9QXhLtFviFsw== X-Received: by 2002:ac8:5942:0:b0:471:f790:3cd4 with SMTP id d75a77b69052e-472228e0a0bmr62807671cf.26.1740164716548; Fri, 21 Feb 2025 11:05:16 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:16 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 2/8] cat-file: add declaration of variable i inside its for loop Date: Fri, 21 Feb 2025 14:04:43 -0500 Message-ID: <20250221190451.12536-3-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some code used in this series declares variable i and only uses it in a for loop, not in any other logic outside the loop. Change the declaration of i to be inside the for loop for readability. While at it, we also change its type from "int" to "size_t" where the latter makes more sense. Helped-by: Christian Couder Signed-off-by: Eric Ju --- builtin/cat-file.c | 11 +++-------- fetch-pack.c | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index b13561cf73..69ea642dc6 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -676,12 +676,10 @@ static void dispatch_calls(struct batch_options *opt, struct queued_cmd *cmd, int nr) { - int i; - if (!opt->buffer_output) die(_("flush is only for --buffer mode")); - for (i = 0; i < nr; i++) + for (size_t i = 0; i < nr; i++) cmd[i].fn(opt, cmd[i].line, output, data); fflush(stdout); @@ -689,9 +687,7 @@ static void dispatch_calls(struct batch_options *opt, static void free_cmds(struct queued_cmd *cmd, size_t *nr) { - size_t i; - - for (i = 0; i < *nr; i++) + for (size_t i = 0; i < *nr; i++) FREE_AND_NULL(cmd[i].line); *nr = 0; @@ -717,7 +713,6 @@ static void batch_objects_command(struct batch_options *opt, size_t alloc = 0, nr = 0; while (strbuf_getdelim_strip_crlf(&input, stdin, opt->input_delim) != EOF) { - int i; const struct parse_cmd *cmd = NULL; const char *p = NULL, *cmd_end; struct queued_cmd call = {0}; @@ -727,7 +722,7 @@ static void batch_objects_command(struct batch_options *opt, if (isspace(*input.buf)) die(_("whitespace before command: '%s'"), input.buf); - for (i = 0; i < ARRAY_SIZE(commands); i++) { + for (size_t i = 0; i < ARRAY_SIZE(commands); i++) { if (!skip_prefix(input.buf, commands[i].name, &cmd_end)) continue; diff --git a/fetch-pack.c b/fetch-pack.c index 1ed5e11dd5..71fb2ca054 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1331,9 +1331,8 @@ static void write_fetch_command_and_capabilities(struct strbuf *req_buf, if (advertise_sid && server_supports_v2("session-id")) packet_buf_write(req_buf, "session-id=%s", trace2_session_id()); if (server_options && server_options->nr) { - int i; ensure_server_supports_v2("server-option"); - for (i = 0; i < server_options->nr; i++) + for (size_t i = 0; i < server_options->nr; i++) packet_buf_write(req_buf, "server-option=%s", server_options->items[i].string); } From patchwork Fri Feb 21 19:04:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986174 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 3C0EC253327 for ; Fri, 21 Feb 2025 19:05:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164721; cv=none; b=KwtCg9VxJG5/otLBwY3mMsxvDQdsedwn434boo5VTylnH62fFHq/KVZrrC/7j11hlf//HsF/K/HV2jqrWMSIePwMFGDoQfVRUans9kMoHYS8pvaI1Ylza9BQrfUiXYf5oZh1sJEuQO6KrXIBGg9XiyrhybusoKW8gJyTPoJ8f4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164721; c=relaxed/simple; bh=McZbMAR62L2h9oeNp+zn5elYKY5wKQl/yuAYLnQeAL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V2m7apsfs8zDvA9FK5Wiag9Ftbr1JfYOroCyob2mJFU1kvmjGf5hjk3vNdiCq9/sSNWOLih0Db4EXqfx5/KIISD1fZO3vke8RM6gyURDL098kb8GDfece6Q2syvf4DntelVIZ3JDsaZKOkfEmMDU5lJpwEpJNWjFYPmCUUdEjN8= 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=PFw0bhw2; arc=none smtp.client-ip=209.85.160.179 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="PFw0bhw2" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-471f4909650so22576841cf.2 for ; Fri, 21 Feb 2025 11:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164719; x=1740769519; 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=B1CvhWUmF15d1EGDFVeM3CX85Oev2ufijaQZG9v76Wc=; b=PFw0bhw2TaObFZviXUqiu1trQgU1AxO2iell3bI7I0/5Uxdf+K/AJJfn1HR8XKVI/G yIGjT1V/nI2u1jlVgZYC+mFyWg+NPqX3oHNngRZ4aXA1qeSgWjek8QnkDcapiledlZhK gCHXlnUOveigsXAgcngRaUDhzvVo4PpUfmBHvJx/IY88Pg2GrWJOtNq80BmkMctTm11M lTiAnx9xcsDRemSDQ7b/Bcp2JQO+OGF/Mi10meGLTlOCnhTHQDMsmNO6oi4nSDXXhfqT BRJ9VJMhJKB44XtP0PxbtFxVdzZJv0674RCZ8qZRCQVERNnmZBMKDdMjo41tU63Gr5eZ 7MGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164719; x=1740769519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B1CvhWUmF15d1EGDFVeM3CX85Oev2ufijaQZG9v76Wc=; b=h6Nq3BPemXZ7tsKlZy+aMBRTw/U/rbhfWDCpOcdT6pco6lJMkDGCQJB/iEvzgIDvAP 3wRhYAK6w8JAHsO7W9DhN2z7Ao2nf20XqCyOcqaMFw4OGxQElFyDSasELncPi3VJqVc6 yKSkHni7uHJVjDjzuOX/02XOFGx4NYfHUqL0ya0lJAmllRN2o/lOUxIDMEBZbYmyf4Dd VT+G32T+DRDX7cSVbmt5wF6Fu+XaAIOI/Y32jpiXEHNP43UJBgLtmVmorKS5v9duL6pe SziKCuq4rfdh/skX7L9U49d1gvQKRUcT92RA+/dAscp34nZC8CWKecbhG6u+yd1C12ot ZvBg== X-Gm-Message-State: AOJu0YyOMu/9l+kRRoHGkBkRa077KETN8dFpgU2mXGU0b2wqQUtZOgn7 pEZjeTvivGOXcybsGXw88uCWzhBnEdzPSoBTajOW+tnq2djoOh7PZpWksynxdos= X-Gm-Gg: ASbGncv4Ou1VSWcoLOHC+Bg/WkVpI+LLObzTK2TYjAzcedvOJdUnZvfhPHP4P02JsE4 2ZC9zSvIg27RIqb68yzywurLHm/TPMt4nKZxffl40Q9zsnKC60ke9EhyFK5Li42DKKQl1opDnoK vgzBHFaSJe46CLGoDTxzJnKEFqzb54L5SfMOxtxu4jXMcFuqBj19RKX4yf0b4+ZmjLQbDLTrn5+ UevpW+63CXoVjg+h6U5S3jr5dnMGUCNS8j34vtCzX+xEtirf6FPxUz4xorDUKKRiziCfslEwRGY WrIm3gvCKg43IX0wTel4Y1dDlMrJKxgRZi7bDc8dIh/wy81P7KCL X-Google-Smtp-Source: AGHT+IFshecsn0JR9qTnZsaOtBvTwLxyPunfF2qRhZeSBCrnUGG/h3C6ifxZNc8fPREec7RIwF8r0w== X-Received: by 2002:a05:622a:9:b0:471:fef5:ee68 with SMTP id d75a77b69052e-4722299bd3bmr65026371cf.46.1740164717412; Fri, 21 Feb 2025 11:05:17 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:17 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 3/8] t1006: split test utility functions into new "lib-cat-file.sh" Date: Fri, 21 Feb 2025 14:04:44 -0500 Message-ID: <20250221190451.12536-4-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This refactor extracts utility functions from the cat-file's test script "t1006-cat-file.sh" into a new "lib-cat-file.sh" dedicated library file. The goal is to improve code reuse and readability, enabling future tests to leverage these utilities without duplicating code. --- t/lib-cat-file.sh | 16 ++++++++++++++++ t/t1006-cat-file.sh | 13 +------------ 2 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 t/lib-cat-file.sh diff --git a/t/lib-cat-file.sh b/t/lib-cat-file.sh new file mode 100644 index 0000000000..44af232d74 --- /dev/null +++ b/t/lib-cat-file.sh @@ -0,0 +1,16 @@ +# Library of git-cat-file related test functions. + +# Print a string without a trailing newline. +echo_without_newline () { + printf '%s' "$*" +} + +# Print a string without newlines and replace them with a NULL character (\0). +echo_without_newline_nul () { + echo_without_newline "$@" | tr '\n' '\0' +} + +# Calculate the length of a string. +strlen () { + echo_without_newline "$1" | wc -c | sed -e 's/^ *//' +} diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index 398865d6eb..1c27c10c6f 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -3,6 +3,7 @@ test_description='git cat-file' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-cat-file.sh test_cmdmode_usage () { test_expect_code 129 "$@" 2>err && @@ -98,18 +99,6 @@ do ' done -echo_without_newline () { - printf '%s' "$*" -} - -echo_without_newline_nul () { - echo_without_newline "$@" | tr '\n' '\0' -} - -strlen () { - echo_without_newline "$1" | wc -c | sed -e 's/^ *//' -} - run_tests () { type=$1 oid=$2 From patchwork Fri Feb 21 19:04:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986173 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (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 8CFC3252919 for ; Fri, 21 Feb 2025 19:05:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164721; cv=none; b=l+0ZN5U/SwUhz94Veal4DnDSy/53SBHyDB0vAp/YZOleENrDUhyRQlKEACEsKduEWA2jon9fzypFtHxGGXCEEboTBVSTldkrzNCDfkih1fNT0wr8yy2WnuWD22xhHb5CkD336cUlbR48zQL4GUNxd27S1wNd7FeoCYNoseuAwTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164721; c=relaxed/simple; bh=8NtfoC1Ejc9gdK5WUTnjnxNLSGtsas42taJhWIgkjV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rzavM1YZs35lUCNabRhIV39J6Kqpc7d71hxL0Z5SzTUZQLUImVX4Ddhr9m+aWVW5VsnYBseDptFJwBlrdVMbvCzmFg0ZXuQvOvyfddO9C5VFsaejDMA4z/laRtMP6nc3ILQlqScCgCXiaDqGsVzQP41UTX6kdy20tQPOHk2KeRk= 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=P7XYYfy7; arc=none smtp.client-ip=209.85.160.169 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="P7XYYfy7" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-471f4909650so22576631cf.2 for ; Fri, 21 Feb 2025 11:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164718; x=1740769518; 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=Nmhr4HqbL83sELewUK6bIIk1mDPnwvBASAhn/HNqTyc=; b=P7XYYfy7wq41RWfYyjeMMYw9M3Ofr3Yx95gl3RXo77hccUvOD+6B7cnxQCbzzq7sWz seEnzrZlr424mq1eBcjERQp6ls9Win/6Px6CxY7VeMBZi5pGtCH4EMBoyqSfFnclhVzq m13btwMVbvX822G1YGCzFV7iNe0D/fGktdffXDXX+abEAnB6Z5c0X8K4tJu2cmL38L9Q tPXuZuNoEYKlWjJKcDpZOq87WjaP6Z3LBvZeIQFlDund8qGC5KCSCitNzvFxPa1T54mw Bz0enKS5HE5Ojy0zYeec7Qe7fKdbue+qOFoZ/G1O9wiJd4MbOxdMwFjlise20d6bldIp pvSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164718; x=1740769518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nmhr4HqbL83sELewUK6bIIk1mDPnwvBASAhn/HNqTyc=; b=vZUyJ2j9oAaRJXf4C4GC1KM7y2noshK7XACEpd/6oY7tPZkf5t284DsQM+fQNTPQIL fFPq7tQgIJYvyeAMrdOmoEuiTtefB6wlXq5WaFIg/3bmvDs6AAJuPpKD9mTmcjeQOFvS Hq4o1FhfgJH5m9YBfGFNIwlR6smyNh3ne4o65maShCiJEG/oYj5+ouJRK0Qwsdjlo3tS x37wi2atrOpI7hasaGAMWr/PGrxuGdKXMZndQXDOmHIsM78fGz2rIuPcUIPlg3tZQ6yZ R0IRCo9DUkhq1EcGEW75Pj2BKMYUzvEeogyFaXiLaOb7RVB0P3Ll66clWOyEFIA7ubiz h5Mg== X-Gm-Message-State: AOJu0Yyi5AFt7R1bu9AwddCswN2/T0EFHuEVv2MwEb8eHUHzk180q3+Z e4LlWE8m74DpbkeqRTTCmqd9zvo6gaoDrYuRhCJ0Y8yeNiUa6tDh9LOl50Tx73o= X-Gm-Gg: ASbGnct963zhsgPKBM54l46ENdoIWzoPVSI2zPDgoBf6vzxxPb00trSnY3iiTNpiI4a 2L6E+PST6+vwsd0bs1yTJXfS3VyyboUC+MWwMaMgpWRV2r7CFJ6nfE6ZTDMo7oSwrTwDD/cB1o6 bvuDNWdUF6cLY5Q4/WbpDPm/X7fYcl1hFy/L6h7Rd/AF3/WODDadHEm4DigMWnQl5QlP4LJYqXZ ahpbk0pxeWRbzDv5D8uMXVQmLgxXt9hypfO30dT5s6/XY2Uh15gAKkbpEaE5cxkNl/SUPJs6btD zSUiTEyEM/YPxjmV+LwoTNrKjpw6AiNR1+P3QSsRkJNr79bgDT66 X-Google-Smtp-Source: AGHT+IF9sK+MlWmrMxBMOkpCF8aO/77RZ6sY6zKbVmwochblPC4OPoTHgfaJWPlT/o+2h6afSuguQQ== X-Received: by 2002:ac8:5852:0:b0:471:f7a3:f73 with SMTP id d75a77b69052e-472228d56f0mr62964891cf.21.1740164718281; Fri, 21 Feb 2025 11:05:18 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:17 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 4/8] fetch-pack: refactor packet writing Date: Fri, 21 Feb 2025 14:04:45 -0500 Message-ID: <20250221190451.12536-5-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Calvin Wan Refactor write_fetch_command_and_capabilities() to a more general-purpose function, write_command_and_capabilities(), enabling it to serve both fetch and additional commands. In this context, "command" refers to the "operations" supported by Git's wire protocol https://git-scm.com/docs/protocol-v2, such as a Git subcommand (e.g., git-fetch(1)) or a server-side operation like "object-info" as implemented in commit a2ba162c (object-info: support for retrieving object info, 2021-04-20). Furthermore, write_command_and_capabilities() is moved to connect.c, making it accessible to additional commands in the future. To move write_command_and_capabilities() to connect.c, we need to adjust how `advertise_sid` is managed. Previously, in fetch_pack.c, `advertise_sid` was a static variable, modified using git_config_get_bool(). In connect.c, we now initialize `advertise_sid` at the beginning by directly using git_config_get_bool(). This change is safe because: In the original fetch-pack.c code, there are only two places that write `advertise_sid` : 1. In function do_fetch_pack: if (!server_supports("session-id")) advertise_sid = 0; 2. In function fetch_pack_config(): git_config_get_bool("transfer.advertisesid", &advertise_sid); About 1, since do_fetch_pack() is only relevant for protocol v1, this assignment can be ignored in our refactor, as write_command_and_capabilities() is only used in protocol v2. About 2, git_config_get_bool() is from config.h and it is an out-of-box dependency of connect.c, so we can reuse it directly. Helped-by: Jonathan Tan Helped-by: Christian Couder Signed-off-by: Calvin Wan Signed-off-by: Eric Ju --- connect.c | 34 ++++++++++++++++++++++++++++++++++ connect.h | 8 ++++++++ fetch-pack.c | 35 ++--------------------------------- 3 files changed, 44 insertions(+), 33 deletions(-) diff --git a/connect.c b/connect.c index 91f3990014..6647b4a4b6 100644 --- a/connect.c +++ b/connect.c @@ -688,6 +688,40 @@ int server_supports(const char *feature) return !!server_feature_value(feature, NULL); } +void write_command_and_capabilities(struct strbuf *req_buf, const char *command, + const struct string_list *server_options) +{ + const char *hash_name; + int advertise_sid; + + git_config_get_bool("transfer.advertisesid", &advertise_sid); + + ensure_server_supports_v2(command); + packet_buf_write(req_buf, "command=%s", command); + if (server_supports_v2("agent")) + packet_buf_write(req_buf, "agent=%s", git_user_agent_sanitized()); + if (advertise_sid && server_supports_v2("session-id")) + packet_buf_write(req_buf, "session-id=%s", trace2_session_id()); + if (server_options && server_options->nr) { + ensure_server_supports_v2("server-option"); + for (size_t i = 0; i < server_options->nr; i++) + packet_buf_write(req_buf, "server-option=%s", + server_options->items[i].string); + } + + if (server_feature_v2("object-format", &hash_name)) { + const int hash_algo = hash_algo_by_name(hash_name); + if (hash_algo_by_ptr(the_hash_algo) != hash_algo) + die(_("mismatched algorithms: client %s; server %s"), + the_hash_algo->name, hash_name); + packet_buf_write(req_buf, "object-format=%s", the_hash_algo->name); + } else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) { + die(_("the server does not support algorithm '%s'"), + the_hash_algo->name); + } + packet_buf_delim(req_buf); +} + enum protocol { PROTO_LOCAL = 1, PROTO_FILE, diff --git a/connect.h b/connect.h index 1645126c17..d904c73a85 100644 --- a/connect.h +++ b/connect.h @@ -30,4 +30,12 @@ void check_stateless_delimiter(int stateless_rpc, struct packet_reader *reader, const char *error); +/* + * Writes a command along with the requested + * server capabilities/features into a request buffer. + */ +struct string_list; +void write_command_and_capabilities(struct strbuf *req_buf, const char *command, + const struct string_list *server_options); + #endif diff --git a/fetch-pack.c b/fetch-pack.c index 71fb2ca054..19b4a092ea 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1319,37 +1319,6 @@ static int add_haves(struct fetch_negotiator *negotiator, return haves_added; } -static void write_fetch_command_and_capabilities(struct strbuf *req_buf, - const struct string_list *server_options) -{ - const char *hash_name; - - ensure_server_supports_v2("fetch"); - packet_buf_write(req_buf, "command=fetch"); - if (server_supports_v2("agent")) - packet_buf_write(req_buf, "agent=%s", git_user_agent_sanitized()); - if (advertise_sid && server_supports_v2("session-id")) - packet_buf_write(req_buf, "session-id=%s", trace2_session_id()); - if (server_options && server_options->nr) { - ensure_server_supports_v2("server-option"); - for (size_t i = 0; i < server_options->nr; i++) - packet_buf_write(req_buf, "server-option=%s", - server_options->items[i].string); - } - - if (server_feature_v2("object-format", &hash_name)) { - int hash_algo = hash_algo_by_name(hash_name); - if (hash_algo_by_ptr(the_hash_algo) != hash_algo) - die(_("mismatched algorithms: client %s; server %s"), - the_hash_algo->name, hash_name); - packet_buf_write(req_buf, "object-format=%s", the_hash_algo->name); - } else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) { - die(_("the server does not support algorithm '%s'"), - the_hash_algo->name); - } - packet_buf_delim(req_buf); -} - static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, struct fetch_pack_args *args, const struct ref *wants, struct oidset *common, @@ -1360,7 +1329,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, int done_sent = 0; struct strbuf req_buf = STRBUF_INIT; - write_fetch_command_and_capabilities(&req_buf, args->server_options); + write_command_and_capabilities(&req_buf, "fetch", args->server_options); if (args->use_thin_pack) packet_buf_write(&req_buf, "thin-pack"); @@ -2188,7 +2157,7 @@ void negotiate_using_fetch(const struct oid_array *negotiation_tips, the_repository, "%d", negotiation_round); strbuf_reset(&req_buf); - write_fetch_command_and_capabilities(&req_buf, server_options); + write_command_and_capabilities(&req_buf, "fetch", server_options); packet_buf_write(&req_buf, "wait-for-done"); From patchwork Fri Feb 21 19:04:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986175 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 5D8C0253329 for ; Fri, 21 Feb 2025 19:05:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164721; cv=none; b=PuytF6N6KEW7Ol3Nq72nYrsJc7BGO2luzGnUe/5oWgKe0+EId739B5Trj+mucR3sKRooO219UiWXB5zD2H7pYwNsjywCWW6aI7pjqYpbKXPdbwAdjlpEN5pC5VAEPJ1m1H803DVZ4JYUTlMOi7A5oA9sMaBgi5R0D9Co8xRMoaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164721; c=relaxed/simple; bh=Ta2SdK0VKTJwcutYpIweqDKNyyy8FQzaKwg6QdoIc+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jzcub0uLn/jS47x8TNIT7/BtTA/byJHvcm0DfGJabt4oXnBuFeZ04Z9ZNi7Sm2cUJeQyCbv+Pwo/oN9Pm6U19btRc8uPVk7uulJzbOhyAdEx9dtmDQchWJrQAXS3sbNs+MLy2gZN6xFbwmiyscAjwgv2NjHZ9RLRhhlMRN05XnQ= 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=C44WISwE; arc=none smtp.client-ip=209.85.160.182 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="C44WISwE" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-472087177a5so30634011cf.2 for ; Fri, 21 Feb 2025 11:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164719; x=1740769519; 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=oEjCHL98ZHvqyXVYNHcGtHiDJFUhnynDHrJTzoC1nT8=; b=C44WISwEKmXkpgW9ACD9UGVFjV5mpZlv40tdUkXw/ZpRGHDF3OHqPIycgGzypVuImB 2xUAtw10mGhI22Diipl4FgIByUimpYLXGnsNm+XZG9tcuyownOSIB1PugVqjimYeaHkB ZpAQGGMTmw5UEbPbzg2jQa/sVcPUl3kWRjnjBR5nH8+BLZ1MP6PjmHhvLkX1kjFVL1p+ Vb5f4jNYfar3ZY1YU132yT9GSa0FDBJDiJyxcREAmCWfWgM1OkwAKGWCfhjFYTCCOqu7 718dNXtArky9R3Liib+/fuWxpcPHO9zJsdsb8YHtDBzuwxtztgCovzq6XL+A2skwCrcP p8dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164719; x=1740769519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oEjCHL98ZHvqyXVYNHcGtHiDJFUhnynDHrJTzoC1nT8=; b=MXh0EzsqH/wPGUCIUyDUIscthtSesj82CPN2wooDiCsZg49LqpPs81P0Ls3xagnCio vm0YoTNxG8C6h8dkK2jp/rZNFZBgAGVKTC/BZNb/Wy1h+ee4p0/oPTjBbghMV/6TgdW0 kj8YgJ7gHQvDtTxLzdTKPLsuBWvZR29jSz/jh/GJnkBsgGlS+2tMREGpBCG2gvmrYEWR VEKbhMW1M0YpYT4sgxz085dQhScyJ25fr54SKD9hWkzGnZY+YVB5YGVN4Icsh9aQ1HBO 0L40c6xpj21XkFUdROGMgabbkXB2xzhD5lGrscXAW2yfDOFHkOrEvUxfrIc8dksS1/79 m9Aw== X-Gm-Message-State: AOJu0Yy4t1kpIeX3wvKRakCNMFrDS0ihO0V+uOQo6+0IpVDG28vmF2vp ia8muHdnyWLFzs7QCH53AFHu3wpqsafz3IksnuiVU9VeKDX7fgWCEN1Z2PMxrq0= X-Gm-Gg: ASbGnctkbV3o/f12MfSjk/YUpdZjnryTMhnWVNEJrXCb0AMBO3/Uu+ntgqfphS8fJqm M6cPkFxdE+UrR5aXvUftYyi9/OxpbXQ8afCTMZRRYNQlGkKSioQ1JCmV/egrvWy72TUmJ0SSuRz zy/lYMPSx+2OnvEjv1FqiTMza4fau8AYlUiXAFQytF0drBZRfp8B4Vg9WLjJckaBgc6vVIurdUM oKuWgGV6kGr+n9ULoXl1dyo80igMLXHGb1Loas1lRhQQGMsqwNCpwo+PqTqkIvNumMnhcYw0VHC N3CyL23h3xfRsfuWALQQ+GGtQOF0jtbUCRzNBFlyXBNBU6FU60TN X-Google-Smtp-Source: AGHT+IHUA1xxxeDPHpXOQytDJgGGng8PM6cwvVXi2sIwQU0VPimnQk3FyD/XXAWdHhAnAarvceXqcQ== X-Received: by 2002:a05:622a:180b:b0:471:f55f:85f3 with SMTP id d75a77b69052e-472228d2698mr67645331cf.20.1740164719285; Fri, 21 Feb 2025 11:05:19 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:18 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 5/8] fetch-pack: move fetch initialization Date: Fri, 21 Feb 2025 14:04:46 -0500 Message-ID: <20250221190451.12536-6-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Calvin Wan There are some variables initialized at the start of the do_fetch_pack_v2() state machine. Currently, they are initialized in FETCH_CHECK_LOCAL, which is the initial state set at the beginning of the function. However, a subsequent patch will allow for another initial state, while still requiring these initialized variables. Move the initialization to be before the state machine, so that they are set regardless of the initial state. Note that there is no change in behavior, because we're moving code from the beginning of the first state to just before the execution of the state machine. Helped-by: Jonathan Tan Helped-by: Christian Couder Signed-off-by: Calvin Wan Signed-off-by: Eric Ju --- fetch-pack.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 19b4a092ea..35dccea073 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1650,18 +1650,18 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, reader.me = "fetch-pack"; } + /* v2 supports these by default */ + allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; + use_sideband = 2; + if (args->depth > 0 || args->deepen_since || args->deepen_not) + args->deepen = 1; + while (state != FETCH_DONE) { switch (state) { case FETCH_CHECK_LOCAL: sort_ref_list(&ref, ref_compare_name); QSORT(sought, nr_sought, cmp_ref_by_name); - /* v2 supports these by default */ - allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; - use_sideband = 2; - if (args->depth > 0 || args->deepen_since || args->deepen_not) - args->deepen = 1; - /* Filter 'ref' by 'sought' and those that aren't local */ mark_complete_and_common_ref(negotiator, args, &ref); filter_refs(args, &ref, sought, nr_sought); From patchwork Fri Feb 21 19:04:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986176 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (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 790F925332F for ; Fri, 21 Feb 2025 19:05:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164723; cv=none; b=inRz5iZ0EKKbCiOa+RUdRlTpJF9AxuoJz4gvKG7EtW7Z2FB8iWYOpd6nWnB3iqh7lM8uYqdTiMMD3+dV0q+05jnBh5WnktotRzW1gmgP4u9tRd2BMYHgwgfqZUBihVY3BvhxKtM5AaBykRfuz4jhcjtz2MrLlpFwMtjKlyanKsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164723; c=relaxed/simple; bh=WUDuPJvUvWrwKs94DpXTw1gJShlhBTtqSvRB9qRuqt8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pedPCsv75NbicxBS/YqpA4wmaEi2alB6kAg23rusjqMP1wYuslbd6VZw1OgkMLc+l6d7al+85drFtDb+q31dNuJMBurHBeNCM8tT9/HdqUIDAz4D3+PWbkHGEZNPObo41AR7tQj8IWhICtnxj0nEXT/N5D2IYcYF+m1zhoG7Eb0= 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=WcuwTgTg; arc=none smtp.client-ip=209.85.160.170 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="WcuwTgTg" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-4721bfdb565so28585381cf.1 for ; Fri, 21 Feb 2025 11:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164720; x=1740769520; 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=r+Zq4FdR9RSEIcjfaw4KdkNm9g/Ip7kzz1JPhNg7iNs=; b=WcuwTgTgo9Dz703JVdgk1+RQ8RDc4aSEY8ikbtPeVxgMiZ3c6WB9Om5kWD61zPfg6e cFwpxR5TqH1BsYkAoWmc+qS2v8yGh9zSyQSleNp4WzVIF079LL/FLHa3OgS6thy8vXRx Vaa5asdAgmUhkpiya8rqWFkuO+T6iPgy7I32GqwHai88e7hLd5VQNURqyvKI3w7oOGxV YyxGu5qZxhp5cU2EAbm4LH5eYutIYCwb4rOzxPzuc7p4fdNqM0t4e66QZqingDBnqv1b 4zdIBNUv4WVyWML6TJaxRlpNCxMWAc2ZW3EqXpxfiZGnV9x2hbcifd4r2q2aCsPifSYb wOkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164720; x=1740769520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r+Zq4FdR9RSEIcjfaw4KdkNm9g/Ip7kzz1JPhNg7iNs=; b=CrrHOgPmQoFqENuJOA9XUlJStT9rgVbJqqeA9+Zku5BMn6bcYHKPxyTJdmRKSUmssj j81fHGUlMpeoYRqpaiYQMQsbnvwl7XhbO4AGBW8ixEUDFxdMsEVYPiAe2hT3TOX3oOE0 sLpR4Bim1O3J481PaoHk9oJ2S8bHc2gQUY9VIkADmXcUSWdEHU/8/VDlXMqM0OLTfh1J nI1EftEEFk1rFHyFOlbZDUDBcekEclbgCY7ZOdDWjlkXlEq3inReBMnrsY8lXgEFHBTN /oKIo2tOEuRPoAX9Co3lFgLcctTPOEkcnqDOJ5LgWkiFI0iisHm2cHKs7NCnzmdtISRc oQjw== X-Gm-Message-State: AOJu0YziKTX3CNgcvCw+AxaEykynnXnBiF0A2xMLLHuAz159Fb4OWIjV 2U+NNbnO06K285FSkvIKWRh0ATNoqCjmVIyNb/E6ibHgrH2ABbYjYvAAVzT1k14= X-Gm-Gg: ASbGncsPkU1SJbSGbCatO7xoGNTUwgpfluthQmkXa4+dsGOJIWUpMBslArEAWRh3S6v rzcxknoMWqztzqEtBJcHrOgn+Fblg22+Zc5dIORDDnWHREnOBCQzSV+XWtNlVjCTCjSl5kkQ2Rq 6i4vS+Im+docHO7kRTxGWxW44hl0/mYpvdJMiXPUmDCnLjcdbBraR4JPmaAntNVUVD8igqsJEEK gk3614Xj3P6E0JP65VvREf/IrEzG/nwyOrk4lV/Df+jvl3WIiYITji9g3BeQcjD0nM332cHXWBN h4iBPX7vgELrrv6U3HMG+xHTJ1Vy3mZb9PORJBUOpexhmqU7Jk2q X-Google-Smtp-Source: AGHT+IFM24SOSQInHugF4htJVxWYH+cbGmFVFB9Fa32Z2yDyiuQwM8fQk6nHszu6hCfSb7jiov6UJg== X-Received: by 2002:a05:622a:354:b0:472:1ee7:d41 with SMTP id d75a77b69052e-472228afd86mr55230131cf.9.1740164720188; Fri, 21 Feb 2025 11:05:20 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:19 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 6/8] serve: advertise object-info feature Date: Fri, 21 Feb 2025 14:04:47 -0500 Message-ID: <20250221190451.12536-7-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Calvin Wan In order for a client to know what object-info components a server can provide, advertise supported object-info features. This will allow a client to decide whether to query the server for object-info or fetch as a fallback. Helped-by: Jonathan Tan Helped-by: Christian Couder Signed-off-by: Calvin Wan Signed-off-by: Eric Ju --- serve.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serve.c b/serve.c index f6dfe34a2b..92fd26fd0a 100644 --- a/serve.c +++ b/serve.c @@ -68,7 +68,7 @@ static void session_id_receive(struct repository *r UNUSED, trace2_data_string("transfer", NULL, "client-sid", client_sid); } -static int object_info_advertise(struct repository *r, struct strbuf *value UNUSED) +static int object_info_advertise(struct repository *r, struct strbuf *value) { if (advertise_object_info == -1 && repo_config_get_bool(r, "transfer.advertiseobjectinfo", @@ -76,6 +76,8 @@ static int object_info_advertise(struct repository *r, struct strbuf *value UNUS /* disabled by default */ advertise_object_info = 0; } + if (value && advertise_object_info) + strbuf_addstr(value, "size"); return advertise_object_info; } From patchwork Fri Feb 21 19:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986177 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (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 7FB8E253329 for ; Fri, 21 Feb 2025 19:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164725; cv=none; b=JfTvw5XeLfl3L2pBQjXWP+z+2YE1vVSm1rdoUM+h5/Op3BQjOoQ9J3G4vmv7QXeIv3oCOgoya4uOUNh+R9O9hjB9Vn5+/fA8BKLLJmscTUKSEGG7RQyPV3Kt9aRjbYs5IQKvi5J0H7tuIUvmfJUizH9nxU+pkhwpOyVUbh8Fdw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164725; c=relaxed/simple; bh=SwsftzIhiciWw3ez4v10ICADfvPQ7+dPInPep0VoXbw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sXtr//Eab0IVwDcIxwRs2rJRYiRX3iBebAhdrh9T7oAY66s6cAlzrweK0yMI1sqLfXe4DpGMxwVcVvG0Q/bUUyMFzVhagocJbpjxVsTYANQNAORq+nqRomhCJNw+fJcadj9oUOUqaKdmUH34FT6GIj1xwtfwRHzIoVUSsYlPv38= 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=b7G8ps5j; arc=none smtp.client-ip=209.85.160.180 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="b7G8ps5j" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-471fe5e0a80so19875741cf.1 for ; Fri, 21 Feb 2025 11:05:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164722; x=1740769522; 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=iUhTvUDG58ep2PEayM+cGe88Wm965aD9NV7xDFJdAQ4=; b=b7G8ps5jXFu5J1EeiGzbqUll/ETnd0aKXwBweTtFcu14araMgQf7yh6OvoidmsFo3C 0I2KGf5rwSbNFhp1LOaSigMfkXBdOaa5V89/UDzZbybXHXlyQlfrQh2ag5D0qK0OxJej 5evYi9HsrQaHcIByA30fmQT+rGId7B1F9w/dYUPfioApL4tBqdULT51HuVFXRJ9Oj1eP fzEA/kzbyvnDsVxRNcO/9k+YXzkoSeqpLTUxVcGhhUI85bopLJVd57lH5g09vKrXArh2 vViDr9eheMAk6N4OKA5YLg6ivgg/xPKNFvpUSjl/LP4Rhr+J8u+Jyfp5RHuha/IFjnYa zIFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164722; x=1740769522; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iUhTvUDG58ep2PEayM+cGe88Wm965aD9NV7xDFJdAQ4=; b=Z/aN5BKma+GA5bnffZDPubU49LKV2R6w8ZutUVWRg9uIHwHTRrp3kUDFqp+sBIH27Z J5GiugoCjuiogKwHvqOKUcv3Qv7GC/QcNFTIejPemwKzXaLVxT0M5dh5+YPzumGh012o oJog2rjYCMDQMnm3oDQOyz60uf6S71F64/RFZNAMBGm0uCgRzV1uLPydYHA3K26geuf9 mkLEF+eqI8nYFi+aOOalxe4xDLJgHELwfv63sU+I+HEIb550QCmfodSR3EXdpnh60T+U Zzne3s7GV2FGgDIdlVNzpkvw7wpGKOANiC9NKAjUTrkccNVmXO09ChOi63f4TC3n1j3l 7MVg== X-Gm-Message-State: AOJu0YxbgUDO7rLosK+NMJ2co61g/lPyCgadJVvbbvzEjpMA/vYJ2F59 wobHQmp7k0pHIySf+fo5Ez3aTyrtVwdycknGLzPyYew/74Ew2lHmybvSjUs/mnY= X-Gm-Gg: ASbGncvVFRLbt9jFjH+M9RZGZK50r2rlHU1cY28y8NZLZTFX179B6pbXtira+JCJxMX h4pMK7DXLxZJDEk8h+SpvGfs67Y1a6+dENp3mJu+K3nnVGkiz+Wh6nUWkzaSUP5a00qE/Pwzynf hJnXfLzQp20Bm9DncHN/whgj96XIAgB8ddLwjF3mKhffqMePxU36MI3hc0wNB+aGHo/ZdhtvDOf kV3KoVFGbGVK2Yu5MbJ7MJIJwTr3RCvX39O7h4O2xpp9Q40azs5BCYo/Ij6evBw+ySAEQ2G8tOT k+mSEDgkbTdfKVgAAGgLXmyxLgCw9emnZ1igb6Ex9e45VdArxFBm X-Google-Smtp-Source: AGHT+IEZvU3OhGKRLL8F26jGuj7IMiBQObsT5LC1F47mUPU6CtRCOSkUYpQS0xstsm6R9Eji3D3EhA== X-Received: by 2002:a05:622a:118e:b0:472:697:9ab4 with SMTP id d75a77b69052e-472248f50c0mr50682941cf.38.1740164721074; Fri, 21 Feb 2025 11:05:21 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:20 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 7/8] transport: add client support for object-info Date: Fri, 21 Feb 2025 14:04:48 -0500 Message-ID: <20250221190451.12536-8-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- Makefile | 1 + fetch-object-info.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ fetch-object-info.h | 22 ++++++++++++ fetch-pack.c | 3 ++ fetch-pack.h | 2 ++ transport-helper.c | 11 ++++-- transport.c | 28 ++++++++++++++- transport.h | 11 ++++++ 8 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 fetch-object-info.c create mode 100644 fetch-object-info.h diff --git a/Makefile b/Makefile index bcf5ed3f85..bd6786a3d9 100644 --- a/Makefile +++ b/Makefile @@ -1030,6 +1030,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..b279e06dc8 --- /dev/null +++ b/fetch-object-info.c @@ -0,0 +1,85 @@ +#include "git-compat-util.h" +#include "gettext.h" +#include "hex.h" +#include "pkt-line.h" +#include "connect.h" +#include "oid-array.h" +#include "object-store-ll.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: not our ref %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..6184d04d72 --- /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 "object-store-ll.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 35dccea073..92e8a7291c 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1656,6 +1656,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 9d3470366f..119d3369f1 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" @@ -42,6 +43,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/transport-helper.c b/transport-helper.c index d457b42550..9da1547b2c 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -710,8 +710,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")); @@ -727,6 +727,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 6c2801bcbd..95be3771a6 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" @@ -465,8 +466,33 @@ static int fetch_refs_via_pack(struct transport *transport, args.server_options = transport->server_options; args.negotiation_tips = data->options.negotiation_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 44100fa9b7..e61e931863 100644 --- a/transport.h +++ b/transport.h @@ -5,6 +5,7 @@ #include "remote.h" #include "list-objects-filter-options.h" #include "string-list.h" +#include "object-store.h" struct git_transport_options { unsigned thin : 1; @@ -30,6 +31,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; @@ -53,6 +60,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 { From patchwork Fri Feb 21 19:04:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Ju X-Patchwork-Id: 13986178 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 9A976253B44 for ; Fri, 21 Feb 2025 19:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164726; cv=none; b=aeKfkX2S+iTTQYDPACOPmmF4shLrpWIiA9svZkkhNb9ePA90C+x3aiKYBvuSi+LV3VNf/VxcMZw1vq48DQuYLiEgiWlrPcEkCntsf+H3XJHZFWACzhARKXbSHMmJBGS3bBTkHE2+2aR2iNqYC1XdDNUb2fIjj9HcFoXMaY25gMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740164726; c=relaxed/simple; bh=wLh5HtIvmqslkEavWDw7nRKxLZWj2a/DlguELabqwUM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cmGOqegKNgWEtfihIwJsNP4zlaQJIvItqg/gxJ8uHESfKBHlYhrSWOpXJXYvoS5fhuxeLqSiYx4NHKMHjPK1AMnUiXbS4yn46+8GwEi/19jKQTNGBWbA32+VYY+7o08wwPzxLx+D6Or/YDFSdF020odgrBw67KohvuXAJnKJj5c= 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=Tevzbkcl; arc=none smtp.client-ip=209.85.160.172 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="Tevzbkcl" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-471f2e1bea9so23390561cf.2 for ; Fri, 21 Feb 2025 11:05:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740164722; x=1740769522; 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=ymBwWrHNcN1qNT6CGNtrD+66mSJyCUJGQICx9GvmJ7c=; b=TevzbkclF+VAXRdOe7u766w35m2DSEvYpSZQJlaf+3YgeuOx6QkFJ2RKB0fx+lsTPe EwwIT+exqKquJsMdKabDKOPIHI6yB/fuwumdi1o4+T3pfhxJefN2m6fhfGPPCvdOpHaj d1UZMEdw5bNJUaxUZL5j7K5a9Ds5Wy39lo2PteOFbjEQCNsdnyVAwf93ACFnQUskY5GF txwI15d2O03Q83zP3VW++jALXmsd2GkQn5gdn9P9sg0YPSoa1aItq7ndvuA9NbSJ/sVM g9RdJY4ueejFysq7ALHV+utONIcVCLGMIce1HpoDBQc8ShXqoFWfwe2NqPQ2LIUHUozZ 2Okw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740164722; x=1740769522; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ymBwWrHNcN1qNT6CGNtrD+66mSJyCUJGQICx9GvmJ7c=; b=GMbNVvp3mR944mTCZq8sjgywq9z8iTh8g4KfVxcFZIbeGRSjdvMKbsHX6uMWbDuIr7 6tsawredrxIxIcO1bKAUNpHu0e9ha3ymkQ5G7ykHJyAVerf8vXMeMwj/PKxX6L1tY7BB eEYD9l059o/EtYHf2tcElJAx058rtJgfpPCq0CSmza0uX0SAhcsyMRKvxdOafZrkfhUW A2pgO0K2p9kqo++9abRBzpcfBAk7YSpVmsxsdcngK8pcEJUoHcU4eDpC1bpkGMP8yknH 9JL8rQ+N/Rk6MxmtpbGO92yULONex5NFwgSwZ7HulUlkTKpxSxOvN4TKPl5y7NjXfTkt nZlQ== X-Gm-Message-State: AOJu0YwPU+aB7jJTMW1VhdYcHD4D/yV248LufdvSfcdnht4pC7cdhMFK qLL1U+lI1cJpYK3Ag3huygK+dvZSKcHtL7L4fZk0SaCOzFB/RcWz48Ucvpl1lRo= X-Gm-Gg: ASbGncvSXZXKdjmdZwn7AH7Yn5AmWC1itgLywFtxZaBvpOZwrErCkmWBP/rLtG4xuZg jlNTcGV3ZuTvNZDj6CRWG4tscOnK/VgQ4/ZyivRI9ztqP9RtgXP0pyPPwdMQuq+akxPM4YkHHNy 0b0TGFzANngH4WAwu7rRC6OulcEmL1dix5hke5jAgeAJ2fZHUZh+btUhbY2cYzyNIdFRom3CMRM MEh+c8MvzpHkgOOJk+DU0HKy7rwv1qT40g7BStuHJ56kjpscidPyQ+KRRHICcTQvtU/xCMDhs+0 tZqmuGpRXUNB3JuQ55drQ0ctjIxI1MGlHmx0sjSrCZxVNpOW79V4 X-Google-Smtp-Source: AGHT+IEyn6gVOBdWUDRBbpCAIEMsasY5q170s/9dfj+8PzTlDdeAQyxrbTpJhkSQ810S0FmpLR4ijg== X-Received: by 2002:a05:622a:198b:b0:472:2df:6ff5 with SMTP id d75a77b69052e-472228b3947mr68756661cf.5.1740164722037; Fri, 21 Feb 2025 11:05:22 -0800 (PST) Received: from localhost.localdomain ([70.49.151.101]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4720b1fe010sm32945661cf.60.2025.02.21.11.05.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 21 Feb 2025 11:05:21 -0800 (PST) From: Eric Ju To: git@vger.kernel.org Cc: calvinwan@google.com, jonathantanmy@google.com, chriscool@tuxfamily.org, eric.peijian@gmail.com, karthik.188@gmail.com, toon@iotcl.com, jltobler@gmail.com Subject: [PATCH v11 8/8] cat-file: add remote-object-info to batch-command Date: Fri, 21 Feb 2025 14:04:49 -0500 Message-ID: <20250221190451.12536-9-eric.peijian@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221190451.12536-1-eric.peijian@gmail.com> References: <20240628190503.67389-1-eric.peijian@gmail.com> <20250221190451.12536-1-eric.peijian@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since the `info` command in `cat-file --batch-command` prints object info for a given object, it is natural to add another command in `cat-file --batch-command` to print object info for a given object from a remote. Add `remote-object-info` to `cat-file --batch-command`. While `info` takes object ids one at a time, this creates overhead when making requests to a server. So `remote-object-info` instead can take multiple object ids at once. The `cat-file --batch-command` command is generally implemented in the following manner: - Receive and parse input from user - Call respective function attached to command - Get object info, print object info In --buffer mode, this changes to: - Receive and parse input from user - Store respective function attached to command in a queue - After flush, loop through commands in queue - Call respective function attached to command - Get object info, print object info Notice how the getting and printing of object info is accomplished one at a time. As described above, this creates a problem for making requests to a server. Therefore, `remote-object-info` is implemented in the following manner: - Receive and parse input from user If command is `remote-object-info`: - Get object info from remote - Loop through and print each object info Else: - Call respective function attached to command - Parse input, get object info, print object info And finally for --buffer mode `remote-object-info`: - Receive and parse input from user - Store respective function attached to command in a queue - After flush, loop through commands in queue: If command is `remote-object-info`: - Get object info from remote - Loop through and print each object info Else: - Call respective function attached to command - Get object info, print object info To summarize, `remote-object-info` gets object info from the remote and then loops through the object info passed in, printing the info. In order for `remote-object-info` to avoid remote communication overhead in the non-buffer mode, the objects are passed in as such: remote-object-info ... rather than remote-object-info remote-object-info ... remote-object-info Helped-by: Jonathan Tan Helped-by: Christian Couder Signed-off-by: Calvin Wan Signed-off-by: Eric Ju --- Documentation/git-cat-file.adoc | 24 +- builtin/cat-file.c | 114 +++++ object-file.c | 11 + object-store-ll.h | 3 + t/t1017-cat-file-remote-object-info.sh | 664 +++++++++++++++++++++++++ 5 files changed, 812 insertions(+), 4 deletions(-) create mode 100755 t/t1017-cat-file-remote-object-info.sh diff --git a/Documentation/git-cat-file.adoc b/Documentation/git-cat-file.adoc index d5890ae368..4fbb3a077b 100644 --- a/Documentation/git-cat-file.adoc +++ b/Documentation/git-cat-file.adoc @@ -149,6 +149,13 @@ info :: Print object info for object reference ``. This corresponds to the output of `--batch-check`. +remote-object-info ...:: + Print object info for object references `` at specified + `` without downloading objects from the remote. + Raise an error when the `object-info` capability is not supported by the remote. + Raise an error when no object references are provided. + This command may be combined with `--buffer`. + flush:: Used with `--buffer` to execute all preceding commands that were issued since the beginning or since the last flush was issued. When `--buffer` @@ -290,7 +297,8 @@ newline. The available atoms are: The full hex representation of the object name. `objecttype`:: - The type of the object (the same as `cat-file -t` reports). + The type of the object (the same as `cat-file -t` reports). See + `CAVEATS` below. Not supported by `remote-object-info`. `objectsize`:: The size, in bytes, of the object (the same as `cat-file -s` @@ -298,13 +306,14 @@ newline. The available atoms are: `objectsize:disk`:: The size, in bytes, that the object takes up on disk. See the - note about on-disk sizes in the `CAVEATS` section below. + note about on-disk sizes in the `CAVEATS` section below. Not + supported by `remote-object-info`. `deltabase`:: If the object is stored as a delta on-disk, this expands to the full hex representation of the delta base object name. Otherwise, expands to the null OID (all zeroes). See `CAVEATS` - below. + below. Not supported by `remote-object-info`. `rest`:: If this atom is used in the output string, input lines are split @@ -314,7 +323,10 @@ newline. The available atoms are: line) are output in place of the `%(rest)` atom. If no format is specified, the default format is `%(objectname) -%(objecttype) %(objectsize)`. +%(objecttype) %(objectsize)`, except for `remote-object-info` commands which use +`%(objectname) %(objectsize)` for now because "%(objecttype)" is not supported yet. +WARNING: When "%(objecttype)" is supported, the default format WILL be unified, so +DO NOT RELY on the current default format to stay the same!!! If `--batch` is specified, or if `--batch-command` is used with the `contents` command, the object information is followed by the object contents (consisting @@ -396,6 +408,10 @@ scripting purposes. CAVEATS ------- +Note that since %(objecttype), %(objectsize:disk) and %(deltabase) are +currently not supported by the `remote-object-info` command, we will raise +an error and exit when they appear in the format string. + Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 69ea642dc6..47fd2a777b 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -27,6 +27,18 @@ #include "promisor-remote.h" #include "mailmap.h" #include "write-or-die.h" +#include "alias.h" +#include "remote.h" +#include "transport.h" + +/* Maximum length for a remote URL. While no universal standard exists, + * 8K is assumed to be a reasonable limit. + */ +#define MAX_REMOTE_URL_LEN (8*1024) +/* Maximum number of objects allowed in a single remote-object-info request. */ +#define MAX_ALLOWED_OBJ_LIMIT 10000 +/* Maximum input size permitted for the remote-object-info command. */ +#define MAX_REMOTE_OBJ_INFO_LINE (MAX_REMOTE_URL_LEN + MAX_ALLOWED_OBJ_LIMIT * (GIT_MAX_HEXSZ + 1)) enum batch_mode { BATCH_MODE_CONTENTS, @@ -48,6 +60,8 @@ struct batch_options { }; static const char *force_path; +static struct object_info *remote_object_info; +static struct oid_array object_info_oids = OID_ARRAY_INIT; static struct string_list mailmap = STRING_LIST_INIT_NODUP; static int use_mailmap; @@ -579,6 +593,61 @@ static void batch_one_object(const char *obj_name, object_context_release(&ctx); } +static int get_remote_info(struct batch_options *opt, int argc, const char **argv) +{ + int retval = 0; + struct remote *remote = NULL; + struct object_id oid; + struct string_list object_info_options = STRING_LIST_INIT_NODUP; + static struct transport *gtransport; + + /* + * Change the format to "%(objectname) %(objectsize)" when + * remote-object-info command is used. Once we start supporting objecttype + * the default format should change to DEFAULT_FORMAT. + */ + if (!opt->format) + opt->format = "%(objectname) %(objectsize)"; + + remote = remote_get(argv[0]); + if (!remote) + die(_("must supply valid remote when using remote-object-info")); + + oid_array_clear(&object_info_oids); + for (size_t i = 1; i < argc; i++) { + if (get_oid_hex(argv[i], &oid)) + die(_("Not a valid object name %s"), argv[i]); + oid_array_append(&object_info_oids, &oid); + } + if (!object_info_oids.nr) + die(_("remote-object-info requires objects")); + + gtransport = transport_get(remote, NULL); + if (gtransport->smart_options) { + CALLOC_ARRAY(remote_object_info, object_info_oids.nr); + gtransport->smart_options->object_info = 1; + gtransport->smart_options->object_info_oids = &object_info_oids; + + /* 'objectsize' is the only option currently supported */ + if (!strstr(opt->format, "%(objectsize)")) + die(_("%s is currently not supported with remote-object-info"), opt->format); + + string_list_append(&object_info_options, "size"); + + if (object_info_options.nr > 0) { + gtransport->smart_options->object_info_options = &object_info_options; + gtransport->smart_options->object_info_data = remote_object_info; + retval = transport_fetch_refs(gtransport, NULL); + } + } else { + retval = -1; + } + + string_list_clear(&object_info_options, 0); + transport_disconnect(gtransport); + return retval; +} + struct object_cb_data { struct batch_options *opt; struct expand_data *expand; @@ -670,6 +739,50 @@ static void parse_cmd_info(struct batch_options *opt, batch_one_object(line, output, opt, data); } +static void parse_cmd_remote_object_info(struct batch_options *opt, + const char *line, struct strbuf *output, + struct expand_data *data) +{ + int count; + const char **argv; + char *line_to_split; + + if (strlen(line) >= MAX_REMOTE_OBJ_INFO_LINE) + die(_("remote-object-info command input overflow " + "(no more than %d objects are allowed)"), + MAX_ALLOWED_OBJ_LIMIT); + + line_to_split = xstrdup(line); + count = split_cmdline(line_to_split, &argv); + if (count < 0) + die(_("split remote-object-info command")); + + if (get_remote_info(opt, count, argv)) + goto cleanup; + + data->skip_object_info = 1; + for (size_t i = 0; i < object_info_oids.nr; i++) { + data->oid = object_info_oids.oid[i]; + if (remote_object_info[i].sizep) { + /* + * When reaching here, it means remote-object-info can retrieve + * information from server without downloading them. + */ + data->size = *remote_object_info[i].sizep; + opt->batch_mode = BATCH_MODE_INFO; + batch_object_write(argv[i+1], output, opt, data, NULL, 0); + } + } + data->skip_object_info = 0; + +cleanup: + for (size_t i = 0; i < object_info_oids.nr; i++) + free_object_info_contents(&remote_object_info[i]); + free(line_to_split); + free(argv); + free(remote_object_info); +} + static void dispatch_calls(struct batch_options *opt, struct strbuf *output, struct expand_data *data, @@ -701,6 +814,7 @@ static const struct parse_cmd { } commands[] = { { "contents", parse_cmd_contents, 1}, { "info", parse_cmd_info, 1}, + { "remote-object-info", parse_cmd_remote_object_info, 1}, { "flush", NULL, 0}, }; diff --git a/object-file.c b/object-file.c index 00c3a4b910..836554437c 100644 --- a/object-file.c +++ b/object-file.c @@ -3161,3 +3161,14 @@ int read_loose_object(const char *path, munmap(map, mapsize); return ret; } + +void free_object_info_contents(struct object_info *object_info) +{ + if (!object_info) + return; + free(object_info->typep); + free(object_info->sizep); + free(object_info->disk_sizep); + free(object_info->delta_base_oid); + free(object_info->type_name); +} diff --git a/object-store-ll.h b/object-store-ll.h index cd3bd5bd99..20208e1d4f 100644 --- a/object-store-ll.h +++ b/object-store-ll.h @@ -553,4 +553,7 @@ int for_each_object_in_pack(struct packed_git *p, int for_each_packed_object(struct repository *repo, each_packed_object_fn cb, void *data, enum for_each_object_flags flags); +/* Free pointers inside of object_info, but not object_info itself */ +void free_object_info_contents(struct object_info *object_info); + #endif /* OBJECT_STORE_LL_H */ diff --git a/t/t1017-cat-file-remote-object-info.sh b/t/t1017-cat-file-remote-object-info.sh new file mode 100755 index 0000000000..fd6c63cdb9 --- /dev/null +++ b/t/t1017-cat-file-remote-object-info.sh @@ -0,0 +1,664 @@ +#!/bin/sh + +test_description='git cat-file --batch-command with remote-object-info command' + +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-cat-file.sh + +hello_content="Hello World" +hello_size=$(strlen "$hello_content") +hello_oid=$(echo_without_newline "$hello_content" | git hash-object --stdin) + +# This is how we get 13: +# 13 = + + + , where +# file mode is 100644, which is 6 characters; +# file name is hello, which is 5 characters +# a space is 1 character and a null is 1 character +tree_size=$(($(test_oid rawsz) + 13)) + +commit_message="Initial commit" + +# This is how we get 137: +# 137 = + + + +# + + +# + + +# + +# +# An easier way to calculate is: 1. use `git cat-file commit | wc -c`, +# to get 177, 2. then deduct 40 hex characters to get 137 +commit_size=$(($(test_oid hexsz) + 137)) + +tag_header_without_oid="type blob +tag hellotag +tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" +tag_header_without_timestamp="object $hello_oid +$tag_header_without_oid" +tag_description="This is a tag" +tag_content="$tag_header_without_timestamp 0 +0000 + +$tag_description" + +tag_oid=$(echo_without_newline "$tag_content" | git hash-object -t tag --stdin -w) +tag_size=$(strlen "$tag_content") + +set_transport_variables () { + hello_oid=$(echo_without_newline "$hello_content" | git hash-object --stdin) + tree_oid=$(git -C "$1" write-tree) + commit_oid=$(echo_without_newline "$commit_message" | git -C "$1" commit-tree $tree_oid) + tag_oid=$(echo_without_newline "$tag_content" | git -C "$1" hash-object -t tag --stdin -w) + tag_size=$(strlen "$tag_content") +} + +# This section tests --batch-command with remote-object-info command +# Since "%(objecttype)" is currently not supported by the command remote-object-info , +# the filters are set to "%(objectname) %(objectsize)" in some test cases. + +# Test --batch-command remote-object-info with 'git://' transport with +# transfer.advertiseobjectinfo set to true, i.e. server has object-info capability +. "$TEST_DIRECTORY"/lib-git-daemon.sh +start_git_daemon --export-all --enable=receive-pack +daemon_parent=$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent + +test_expect_success 'create repo to be served by git-daemon' ' + git init "$daemon_parent" && + echo_without_newline "$hello_content" > $daemon_parent/hello && + git -C "$daemon_parent" update-index --add hello && + git -C "$daemon_parent" config transfer.advertiseobjectinfo true && + git clone "$GIT_DAEMON_URL/parent" -n "$daemon_parent/daemon_client_empty" +' + +test_expect_success 'batch-command remote-object-info git://' ' + ( + set_transport_variables "$daemon_parent" && + cd "$daemon_parent/daemon_client_empty" && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" >actual <<-EOF && + remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid + remote-object-info "$GIT_DAEMON_URL/parent" $tree_oid + remote-object-info "$GIT_DAEMON_URL/parent" $commit_oid + remote-object-info "$GIT_DAEMON_URL/parent" $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command remote-object-info git:// multiple sha1 per line' ' + ( + set_transport_variables "$daemon_parent" && + cd "$daemon_parent/daemon_client_empty" && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" >actual <<-EOF && + remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid $tree_oid $commit_oid $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command remote-object-info git:// default filter' ' + ( + set_transport_variables "$daemon_parent" && + cd "$daemon_parent/daemon_client_empty" && + + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + GIT_TRACE_PACKET=1 git cat-file --batch-command >actual <<-EOF && + remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid $tree_oid + remote-object-info "$GIT_DAEMON_URL/parent" $commit_oid $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command --buffer remote-object-info git://' ' + ( + set_transport_variables "$daemon_parent" && + cd "$daemon_parent/daemon_client_empty" && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" --buffer >actual <<-EOF && + remote-object-info "$GIT_DAEMON_URL/parent" $hello_oid $tree_oid + remote-object-info "$GIT_DAEMON_URL/parent" $commit_oid $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + flush + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command -Z remote-object-info git:// default filter' ' + ( + set_transport_variables "$daemon_parent" && + cd "$daemon_parent/daemon_client_empty" && + + printf "%s\0" "$hello_oid $hello_size" >expect && + printf "%s\0" "$tree_oid $tree_size" >>expect && + printf "%s\0" "$commit_oid $commit_size" >>expect && + printf "%s\0" "$tag_oid $tag_size" >>expect && + + printf "%s\0" "$hello_oid missing" >>expect && + printf "%s\0" "$tree_oid missing" >>expect && + printf "%s\0" "$commit_oid missing" >>expect && + printf "%s\0" "$tag_oid missing" >>expect && + + batch_input="remote-object-info $GIT_DAEMON_URL/parent $hello_oid $tree_oid +remote-object-info $GIT_DAEMON_URL/parent $commit_oid $tag_oid +info $hello_oid +info $tree_oid +info $commit_oid +info $tag_oid +" && + echo_without_newline_nul "$batch_input" >commands_null_delimited && + + git cat-file --batch-command -Z < commands_null_delimited >actual && + test_cmp expect actual + ) +' + +# Test --batch-command remote-object-info with 'git://' and +# transfer.advertiseobjectinfo set to false, i.e. server does not have object-info capability +test_expect_success 'batch-command remote-object-info git:// fails when transfer.advertiseobjectinfo=false' ' + ( + git -C "$daemon_parent" config transfer.advertiseobjectinfo false && + set_transport_variables "$daemon_parent" && + + test_must_fail git cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info $GIT_DAEMON_URL/parent $hello_oid $tree_oid $commit_oid $tag_oid + EOF + test_grep "object-info capability is not enabled on the server" err && + + # revert server state back + git -C "$daemon_parent" config transfer.advertiseobjectinfo true + + ) +' + +stop_git_daemon + +# Test --batch-command remote-object-info with 'file://' transport with +# transfer.advertiseobjectinfo set to true, i.e. server has object-info capability +# shellcheck disable=SC2016 +test_expect_success 'create repo to be served by file:// transport' ' + git init server && + git -C server config protocol.version 2 && + git -C server config transfer.advertiseobjectinfo true && + echo_without_newline "$hello_content" > server/hello && + git -C server update-index --add hello && + git clone -n "file://$(pwd)/server" file_client_empty +' + +test_expect_success 'batch-command remote-object-info file://' ' + ( + set_transport_variables "server" && + server_path="$(pwd)/server" && + cd file_client_empty && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" >actual <<-EOF && + remote-object-info "file://${server_path}" $hello_oid + remote-object-info "file://${server_path}" $tree_oid + remote-object-info "file://${server_path}" $commit_oid + remote-object-info "file://${server_path}" $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command remote-object-info file:// multiple sha1 per line' ' + ( + set_transport_variables "server" && + server_path="$(pwd)/server" && + cd file_client_empty && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + + git cat-file --batch-command="%(objectname) %(objectsize)" >actual <<-EOF && + remote-object-info "file://${server_path}" $hello_oid $tree_oid $commit_oid $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command --buffer remote-object-info file://' ' + ( + set_transport_variables "server" && + server_path="$(pwd)/server" && + cd file_client_empty && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" --buffer >actual <<-EOF && + remote-object-info "file://${server_path}" $hello_oid $tree_oid + remote-object-info "file://${server_path}" $commit_oid $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + flush + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command remote-object-info file:// default filter' ' + ( + set_transport_variables "server" && + server_path="$(pwd)/server" && + cd file_client_empty && + + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + git cat-file --batch-command >actual <<-EOF && + remote-object-info "file://${server_path}" $hello_oid $tree_oid + remote-object-info "file://${server_path}" $commit_oid $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command -Z remote-object-info file:// default filter' ' + ( + set_transport_variables "server" && + server_path="$(pwd)/server" && + cd file_client_empty && + + printf "%s\0" "$hello_oid $hello_size" >expect && + printf "%s\0" "$tree_oid $tree_size" >>expect && + printf "%s\0" "$commit_oid $commit_size" >>expect && + printf "%s\0" "$tag_oid $tag_size" >>expect && + + printf "%s\0" "$hello_oid missing" >>expect && + printf "%s\0" "$tree_oid missing" >>expect && + printf "%s\0" "$commit_oid missing" >>expect && + printf "%s\0" "$tag_oid missing" >>expect && + + batch_input="remote-object-info \"file://${server_path}\" $hello_oid $tree_oid +remote-object-info \"file://${server_path}\" $commit_oid $tag_oid +info $hello_oid +info $tree_oid +info $commit_oid +info $tag_oid +" && + echo_without_newline_nul "$batch_input" >commands_null_delimited && + + git cat-file --batch-command -Z < commands_null_delimited >actual && + test_cmp expect actual + ) +' + +# Test --batch-command remote-object-info with 'file://' and +# transfer.advertiseobjectinfo set to false, i.e. server does not have object-info capability +test_expect_success 'batch-command remote-object-info file:// fails when transfer.advertiseobjectinfo=false' ' + ( + set_transport_variables "server" && + server_path="$(pwd)/server" && + git -C "${server_path}" config transfer.advertiseobjectinfo false && + + test_must_fail git cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info "file://${server_path}" $hello_oid $tree_oid $commit_oid $tag_oid + EOF + test_grep "object-info capability is not enabled on the server" err && + + # revert server state back + git -C "${server_path}" config transfer.advertiseobjectinfo true + ) +' + +# Test --batch-command remote-object-info with 'http://' transport with +# transfer.advertiseobjectinfo set to true, i.e. server has object-info capability + +. "$TEST_DIRECTORY"/lib-httpd.sh +start_httpd + +test_expect_success 'create repo to be served by http:// transport' ' + git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config transfer.advertiseobjectinfo true && + echo_without_newline "$hello_content" > $HTTPD_DOCUMENT_ROOT_PATH/http_parent/hello && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" update-index --add hello && + git clone "$HTTPD_URL/smart/http_parent" -n "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" +' + +test_expect_success 'batch-command remote-object-info http://' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" >actual <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid + remote-object-info "$HTTPD_URL/smart/http_parent" $tree_oid + remote-object-info "$HTTPD_URL/smart/http_parent" $commit_oid + remote-object-info "$HTTPD_URL/smart/http_parent" $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command remote-object-info http:// one line' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" >actual <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid $tree_oid $commit_oid $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command --buffer remote-object-info http://' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" && + + # These results prove remote-object-info can get object info from the remote + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + # These results prove remote-object-info did not download objects from the remote + echo "$hello_oid missing" >>expect && + echo "$tree_oid missing" >>expect && + echo "$commit_oid missing" >>expect && + echo "$tag_oid missing" >>expect && + + git cat-file --batch-command="%(objectname) %(objectsize)" --buffer >actual <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid $tree_oid + remote-object-info "$HTTPD_URL/smart/http_parent" $commit_oid $tag_oid + info $hello_oid + info $tree_oid + info $commit_oid + info $tag_oid + flush + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command remote-object-info http:// default filter' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" && + + echo "$hello_oid $hello_size" >expect && + echo "$tree_oid $tree_size" >>expect && + echo "$commit_oid $commit_size" >>expect && + echo "$tag_oid $tag_size" >>expect && + + git cat-file --batch-command >actual <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid $tree_oid + remote-object-info "$HTTPD_URL/smart/http_parent" $commit_oid $tag_oid + EOF + test_cmp expect actual + ) +' + +test_expect_success 'batch-command -Z remote-object-info http:// default filter' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_client_empty" && + + printf "%s\0" "$hello_oid $hello_size" >expect && + printf "%s\0" "$tree_oid $tree_size" >>expect && + printf "%s\0" "$commit_oid $commit_size" >>expect && + printf "%s\0" "$tag_oid $tag_size" >>expect && + + batch_input="remote-object-info $HTTPD_URL/smart/http_parent $hello_oid $tree_oid +remote-object-info $HTTPD_URL/smart/http_parent $commit_oid $tag_oid +" && + echo_without_newline_nul "$batch_input" >commands_null_delimited && + + git cat-file --batch-command -Z < commands_null_delimited >actual && + test_cmp expect actual + ) +' + +test_expect_success 'remote-object-info fails on unspported filter option (objectsize:disk)' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + + test_must_fail git cat-file --batch-command="%(objectsize:disk)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid + EOF + test_grep "%(objectsize:disk) is currently not supported with remote-object-info" err + ) +' + +test_expect_success 'remote-object-info fails on unspported filter option (deltabase)' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + + test_must_fail git cat-file --batch-command="%(deltabase)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid + EOF + test_grep "%(deltabase) is currently not supported with remote-object-info" err + ) +' + +test_expect_success 'remote-object-info fails on server with legacy protocol' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + + test_must_fail git -c protocol.version=0 cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid + EOF + test_grep "remote-object-info requires protocol v2" err + ) +' + +test_expect_success 'remote-object-info fails on server with legacy protocol with default filter' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + + test_must_fail git -c protocol.version=0 cat-file --batch-command 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid + EOF + test_grep "remote-object-info requires protocol v2" err + ) +' + +test_expect_success 'remote-object-info fails on malformed OID' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + malformed_object_id="this_id_is_not_valid" && + + test_must_fail git cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $malformed_object_id + EOF + test_grep "Not a valid object name '$malformed_object_id'" err + ) +' + +test_expect_success 'remote-object-info fails on malformed OID with default filter' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + malformed_object_id="this_id_is_not_valid" && + + test_must_fail git cat-file --batch-command 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $malformed_object_id + EOF + test_grep "Not a valid object name '$malformed_object_id'" err + ) +' + +test_expect_success 'remote-object-info fails on missing OID' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + git clone "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" missing_oid_repo && + test_commit -C missing_oid_repo message1 c.txt && + cd missing_oid_repo && + + object_id=$(git rev-parse message1:c.txt) && + test_must_fail git cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $object_id + EOF + test_grep "object-info: not our ref $object_id" err + ) +' + +test_expect_success 'remote-object-info fails on not providing OID' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + cd "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + + test_must_fail git cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" + EOF + test_grep "remote-object-info requires objects" err + ) +' + + +# Test --batch-command remote-object-info with 'http://' transport and +# transfer.advertiseobjectinfo set to false, i.e. server does not have object-info capability +test_expect_success 'batch-command remote-object-info http:// fails when transfer.advertiseobjectinfo=false ' ' + ( + set_transport_variables "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && + git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config transfer.advertiseobjectinfo false && + + test_must_fail git cat-file --batch-command="%(objectname) %(objectsize)" 2>err <<-EOF && + remote-object-info "$HTTPD_URL/smart/http_parent" $hello_oid $tree_oid $commit_oid $tag_oid + EOF + test_grep "object-info capability is not enabled on the server" err && + + # revert server state back + git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config transfer.advertiseobjectinfo true + ) +' + +# DO NOT add non-httpd-specific tests here, because the last part of this +# test script is only executed when httpd is available and enabled. + +test_done