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

transport: propagate fsck configuration during bundle fetch

Browse Source 
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 fsck config parsing from fetch-pack to populate fsck message
severity configuration and wire it through to `unbundle()` to enable the
same fsck verification as done through fetch-pack.

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:12 -06:00
committed by Junio C Hamano
parent 05596e93c5
commit baa159137b
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/t5607-clone-bundle.sh
View File

@ -171,6 +171,13 @@ test_expect_success 'clone bundle with different fsckObjects configurations' '
test_must_fail git -c transfer.fsckObjects=true \ test_must_fail git -c transfer.fsckObjects=true \
clone bundle-fsck/bad.bundle bundle-transfer-fsck 2>err && 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 test_grep "missingEmail" err
' '

20
transport.c
View File

@ -19,6 +19,7 @@
#include "branch.h" #include "branch.h"
#include "url.h" #include "url.h"
#include "submodule.h" #include "submodule.h"
#include "strbuf.h"
#include "string-list.h" #include "string-list.h"
#include "oid-array.h" #include "oid-array.h"
#include "sigchain.h" #include "sigchain.h"
@ -172,6 +173,19 @@ static struct ref *get_refs_from_bundle(struct transport *transport,
return result; return result;
} }
static int fetch_fsck_config_cb(const char *var, const char *value,
const struct config_context *ctx UNUSED, void *cb)
{
struct strbuf *msg_types = cb;
int ret;
ret = fetch_pack_fsck_config(var, value, msg_types);
if (ret > 0)
return 0;
return ret;
}
static int fetch_refs_from_bundle(struct transport *transport, static int fetch_refs_from_bundle(struct transport *transport,
int nr_heads UNUSED, int nr_heads UNUSED,
struct ref **to_fetch UNUSED) struct ref **to_fetch UNUSED)
@ -181,6 +195,7 @@ static int fetch_refs_from_bundle(struct transport *transport,
}; };
struct bundle_transport_data *data = transport->data; struct bundle_transport_data *data = transport->data;
struct strvec extra_index_pack_args = STRVEC_INIT; struct strvec extra_index_pack_args = STRVEC_INIT;
struct strbuf msg_types = STRBUF_INIT;
int ret; int ret;
if (transport->progress) if (transport->progress)
@ -188,11 +203,16 @@ static int fetch_refs_from_bundle(struct transport *transport,
if (!data->get_refs_from_bundle_called) if (!data->get_refs_from_bundle_called)
get_refs_from_bundle_inner(transport); get_refs_from_bundle_inner(transport);
git_config(fetch_fsck_config_cb, &msg_types);
opts.fsck_msg_types = msg_types.buf;
ret = unbundle(the_repository, &data->header, data->fd, ret = unbundle(the_repository, &data->header, data->fd,
&extra_index_pack_args, &opts); &extra_index_pack_args, &opts);
transport->hash_algo = data->header.hash_algo; transport->hash_algo = data->header.hash_algo;
strvec_clear(&extra_index_pack_args); strvec_clear(&extra_index_pack_args);
strbuf_release(&msg_types);
return ret; return ret;
} }