admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bundle: support fsck message configuration

Browse Source 
If the `VERIFY_BUNDLE_FLAG` is set during `unbundle()`, the
git-index-pack(1) spawned is configured with the `--fsck-options` flag
to perform fsck verification. With this flag enabled, there is not a way
to configure fsck message severity though.

Extend the `unbundle_opts` type to store fsck message severity
configuration and update `unbundle()` to conditionally append it to the
`--fsck-objects` flag if provided. This enables `unbundle()` call sites
to support optionally setting the severity for specific fsck messages.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Justin Tobler
2024-11-27 17:33:10 -06:00
committed by Junio C Hamano
parent 87c01003cd
commit 187574ce86
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bundle.c
View File

@@ -631,12 +631,12 @@ int unbundle(struct repository *r, struct bundle_header *header,
struct unbundle_opts *opts)
{
struct child_process ip = CHILD_PROCESS_INIT;
enum verify_bundle_flags flags = 0;
struct unbundle_opts opts_fallback = { 0 };
if (opts)
flags = opts->flags;
if (!opts)
opts = &opts_fallback;
if (verify_bundle(r, header, flags))
if (verify_bundle(r, header, opts->flags))
return -1;
strvec_pushl(&ip.args, "index-pack", "--fix-thin", "--stdin", NULL);
@@ -645,8 +645,9 @@ int unbundle(struct repository *r, struct bundle_header *header,
if (header->filter.choice)
strvec_push(&ip.args, "--promisor=from-bundle");
if (flags & VERIFY_BUNDLE_FSCK)
strvec_push(&ip.args, "--fsck-objects");
if (opts->flags & VERIFY_BUNDLE_FSCK)
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);

7
bundle.h
View File

@@ -41,6 +41,13 @@ int verify_bundle(struct repository *r, struct bundle_header *header,
struct unbundle_opts {
enum verify_bundle_flags flags;
/*
* fsck_msg_types may optionally contain fsck message severity
* configuration. If present, this configuration gets directly appended
* to a '--fsck-objects' option and therefore must be prefixed with '='.
* (E.g. "=missingEmail=ignore,gitmodulesUrl=ignore")
*/
const char *fsck_msg_types;
};
/**