| Message ID | 20241121204119.1440773-6-jltobler@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | propagate fsck message severity for bundle fetch | expand |
Justin Tobler <jltobler@gmail.com> writes: > When fetching directly from a bundle, fsck message severity > configuration is not propagated to the underlying git-index-pack(1). It > is only capable of enabling or disabling fsck checks entirely. This does > not align with the fsck behavior for fetches through git-fetch-pack(1). > > Use the message configuration from fetch-pack and wire it through to > `unbundle()` to enable the same fsck configuration as done through > fetch-pack. > > Signed-off-by: Justin Tobler <jltobler@gmail.com> > --- > t/t5607-clone-bundle.sh | 7 +++++++ > transport.c | 5 +++++ > 2 files changed, 12 insertions(+) Nicely done. > > diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh > index 7ceaa8194d..c69aa88eae 100755 > --- a/t/t5607-clone-bundle.sh > +++ b/t/t5607-clone-bundle.sh > @@ -171,6 +171,13 @@ test_expect_success 'clone bundle with different fsckObjects configurations' ' > > test_must_fail git -c transfer.fsckObjects=true \ > clone bundle-fsck/bad.bundle bundle-transfer-fsck 2>err && > + test_grep "missingEmail" err && > + > + git -c fetch.fsckObjects=true -c fetch.fsck.missingEmail=ignore \ > + clone bundle-fsck/bad.bundle bundle-fsck-ignore && > + > + test_must_fail git -c fetch.fsckObjects=true -c fetch.fsck.missingEmail=error \ > + clone bundle-fsck/bad.bundle bundle-fsck-error 2>err && > test_grep "missingEmail" err > ' > > diff --git a/transport.c b/transport.c > index 7e0ec4adc9..a9e03c3964 100644 > --- a/transport.c > +++ b/transport.c > @@ -178,6 +178,7 @@ static int fetch_refs_from_bundle(struct transport *transport, > { > struct verify_bundle_opts opts = { .flags = fetch_pack_fsck_objects() ? > VERIFY_BUNDLE_FSCK : 0 }; > + struct fetch_pack_options fetch_pack_options = FETCH_PACK_OPTIONS_INIT; > struct bundle_transport_data *data = transport->data; > struct strvec extra_index_pack_args = STRVEC_INIT; > int ret; > @@ -188,11 +189,15 @@ static int fetch_refs_from_bundle(struct transport *transport, > if (!data->get_refs_from_bundle_called) > get_refs_from_bundle_inner(transport); > > + git_config(fetch_pack_config_cb, &fetch_pack_options); > + opts.fsck_msg_types = fetch_pack_options.fsck_msg_types.buf; > + > ret = unbundle(the_repository, &data->header, data->fd, > &extra_index_pack_args, &opts); > transport->hash_algo = data->header.hash_algo; > > strvec_clear(&extra_index_pack_args); > + strbuf_release(&fetch_pack_options.fsck_msg_types); > return ret; > }
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh index 7ceaa8194d..c69aa88eae 100755 --- a/t/t5607-clone-bundle.sh +++ b/t/t5607-clone-bundle.sh @@ -171,6 +171,13 @@ test_expect_success 'clone bundle with different fsckObjects configurations' ' test_must_fail git -c transfer.fsckObjects=true \ clone bundle-fsck/bad.bundle bundle-transfer-fsck 2>err && + test_grep "missingEmail" err && + + git -c fetch.fsckObjects=true -c fetch.fsck.missingEmail=ignore \ + clone bundle-fsck/bad.bundle bundle-fsck-ignore && + + test_must_fail git -c fetch.fsckObjects=true -c fetch.fsck.missingEmail=error \ + clone bundle-fsck/bad.bundle bundle-fsck-error 2>err && test_grep "missingEmail" err ' diff --git a/transport.c b/transport.c index 7e0ec4adc9..a9e03c3964 100644 --- a/transport.c +++ b/transport.c @@ -178,6 +178,7 @@ static int fetch_refs_from_bundle(struct transport *transport, { struct verify_bundle_opts opts = { .flags = fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK : 0 }; + struct fetch_pack_options fetch_pack_options = FETCH_PACK_OPTIONS_INIT; struct bundle_transport_data *data = transport->data; struct strvec extra_index_pack_args = STRVEC_INIT; int ret; @@ -188,11 +189,15 @@ static int fetch_refs_from_bundle(struct transport *transport, if (!data->get_refs_from_bundle_called) get_refs_from_bundle_inner(transport); + git_config(fetch_pack_config_cb, &fetch_pack_options); + opts.fsck_msg_types = fetch_pack_options.fsck_msg_types.buf; + ret = unbundle(the_repository, &data->header, data->fd, &extra_index_pack_args, &opts); transport->hash_algo = data->header.hash_algo; strvec_clear(&extra_index_pack_args); + strbuf_release(&fetch_pack_options.fsck_msg_types); return ret; }
When fetching directly from a bundle, fsck message severity configuration is not propagated to the underlying git-index-pack(1). It is only capable of enabling or disabling fsck checks entirely. This does not align with the fsck behavior for fetches through git-fetch-pack(1). Use the message configuration from fetch-pack and wire it through to `unbundle()` to enable the same fsck configuration as done through fetch-pack. Signed-off-by: Justin Tobler <jltobler@gmail.com> --- t/t5607-clone-bundle.sh | 7 +++++++ transport.c | 5 +++++ 2 files changed, 12 insertions(+)