[PATCH 2/5] bundle: support fsck message configuration
- From
Justin Tobler <jltobler@gmail.com>
- Date
- Nov 21, 2024, 20:41 UTC
- Message-ID
- <20241121204119.1440773-3-jltobler@gmail.com>
- 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