git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Justin Tobler <jltobler@gmail.com>
To: git@vger.kernel.org
Cc: Justin Tobler <jltobler@gmail.com>
Subject: [PATCH 2/5] bundle: support fsck message configuration
Date: Thu, 21 Nov 2024 14:41:16 -0600	[thread overview]
Message-ID: <20241121204119.1440773-3-jltobler@gmail.com> (raw)
In-Reply-To: <20241121204119.1440773-1-jltobler@gmail.com>

The git-index-pack(1) spawned during `unbundle()` can be optionally
configured with `--fsck-objects` to perform fsck checks on the bundle.
This does not propagate fsck message severity configuration though.

Extend `verify_bundle_opts` to store this information and update
`unbundle()` to configure the `--fsck-objects` option appropriately.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
---
 bundle.c | 3 ++-
 bundle.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundle.c b/bundle.c
index db17f50ee0..97b70e2e51 100644
--- a/bundle.c
+++ b/bundle.c
@@ -646,7 +646,8 @@ int unbundle(struct repository *r, struct bundle_header *header, int bundle_fd,
 		strvec_push(&ip.args, "--promisor=from-bundle");
 
 	if (opts.flags & VERIFY_BUNDLE_FSCK)
-		strvec_push(&ip.args, "--fsck-objects");
+		strvec_pushf(&ip.args, "--fsck-objects%s",
+			     opts.fsck_msg_types ? opts.fsck_msg_types : "");
 
 	if (extra_index_pack_args)
 		strvec_pushv(&ip.args, extra_index_pack_args->v);
diff --git a/bundle.h b/bundle.h
index bddf44c267..2a7b556f83 100644
--- a/bundle.h
+++ b/bundle.h
@@ -41,6 +41,7 @@ int verify_bundle(struct repository *r, struct bundle_header *header,
 
 struct verify_bundle_opts {
 	enum verify_bundle_flags flags;
+	const char *fsck_msg_types;
 };
 
 /**
-- 
2.47.0


  parent reply	other threads:[~2024-11-21 20:44 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-21 20:41 [PATCH 0/5] propagate fsck message severity for bundle fetch Justin Tobler
2024-11-21 20:41 ` [PATCH 1/5] bundle: add bundle verification options type Justin Tobler
2024-11-22  1:21   ` Junio C Hamano
2024-11-22 15:22     ` Justin Tobler
2024-11-26  9:08   ` Patrick Steinhardt
2024-11-26 15:59     ` Justin Tobler
2024-11-21 20:41 ` Justin Tobler [this message]
2024-11-22  1:30   ` [PATCH 2/5] bundle: support fsck message configuration Junio C Hamano
2024-11-22 15:44     ` Justin Tobler
2024-11-25  1:33       ` Junio C Hamano
2024-11-21 20:41 ` [PATCH 3/5] fetch-pack: introduce `fetch_pack_options` Justin Tobler
2024-11-22  1:46   ` Junio C Hamano
2024-11-22  3:46     ` Junio C Hamano
2024-11-22 17:31     ` Justin Tobler
2024-11-21 20:41 ` [PATCH 4/5] fetch-pack: expose `fetch_pack_config_cb()` Justin Tobler
2024-11-22  1:57   ` Junio C Hamano
2024-11-22 17:41     ` Justin Tobler
2024-11-22 16:45   ` shejialuo
2024-11-27  1:21     ` Justin Tobler
2024-11-21 20:41 ` [PATCH 5/5] transport: propagate fsck configuration during bundle fetch Justin Tobler
2024-11-22  1:59   ` Junio C Hamano
2024-11-27  0:57 ` [PATCH v2 0/4] propagate fsck message severity for " Justin Tobler
2024-11-27  0:57   ` [PATCH v2 1/4] bundle: add bundle verification options type Justin Tobler
2024-11-27  0:57   ` [PATCH v2 2/4] bundle: support fsck message configuration Justin Tobler
2024-11-27  5:44     ` Patrick Steinhardt
2024-11-27  0:57   ` [PATCH v2 3/4] fetch-pack: split out fsck config parsing Justin Tobler
2024-11-27  5:44     ` Patrick Steinhardt
2024-11-27 17:37       ` Justin Tobler
2024-11-27  0:57   ` [PATCH v2 4/4] transport: propagate fsck configuration during bundle fetch Justin Tobler
2024-11-27  1:39     ` Junio C Hamano
2024-11-27 23:33   ` [PATCH v3 0/4] propagate fsck message severity for " Justin Tobler
2024-11-27 23:33     ` [PATCH v3 1/4] bundle: add bundle verification options type Justin Tobler
2024-11-27 23:33     ` [PATCH v3 2/4] bundle: support fsck message configuration Justin Tobler
2024-11-27 23:33     ` [PATCH v3 3/4] fetch-pack: split out fsck config parsing Justin Tobler
2024-11-28  3:25       ` Junio C Hamano
2024-12-03  9:34         ` Patrick Steinhardt
2024-12-03 14:23           ` Justin Tobler
2024-12-03 14:28             ` Patrick Steinhardt
2024-12-03 23:17               ` Junio C Hamano
2024-12-04  2:39                 ` Junio C Hamano
2024-11-27 23:33     ` [PATCH v3 4/4] transport: propagate fsck configuration during bundle fetch Justin Tobler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241121204119.1440773-3-jltobler@gmail.com \
    --to=jltobler@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).