diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-08 14:53:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-08 14:53:11 -0700 |
| commit | 125e38947087906be17fb4e237fc09764df97c65 (patch) | |
| tree | d3a5a64bacceb6485f186f99048cce117de76dbc /transport.c | |
| parent | 3997614c249b4b475d07c00556446d8b698d1a49 (diff) | |
| parent | 63d903ff52594eb52289abb89db1a4bca7b0f946 (diff) | |
Merge branch 'xx/bundie-uri-fixes'
When bundleURI interface fetches multiple bundles, Git failed to
take full advantage of all bundles and ended up slurping duplicated
objects.
* xx/bundie-uri-fixes:
unbundle: extend object verification for fetches
fetch-pack: expose fsckObjects configuration logic
bundle-uri: verify oid before writing refs
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 139721a990..12cc5b4d96 100644 --- a/transport.c +++ b/transport.c @@ -186,7 +186,8 @@ static int fetch_refs_from_bundle(struct transport *transport, if (!data->get_refs_from_bundle_called) get_refs_from_bundle_inner(transport); ret = unbundle(the_repository, &data->header, data->fd, - &extra_index_pack_args, 0); + &extra_index_pack_args, + fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK : 0); transport->hash_algo = data->header.hash_algo; return ret; } |