mirror of
https://github.com/git/git.git
synced 2026-01-09 17:46:37 +00:00
midx: drop redundant struct repository parameter
There are a couple of functions that take both a `struct repository` and a `struct multi_pack_index`. This provides redundant information though without much benefit given that the multi-pack index already has a pointer to its owning repository. Drop the `struct repository` parameter from such functions. While at it, reorder the list of parameters of `fill_midx_entry()` so that the MIDX comes first to better align with our coding guidelines. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
57363dfa0d
commit
9ff2129615
@@ -493,7 +493,7 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
|
||||
}
|
||||
|
||||
for (i = 0; i < bitmap_git->midx->num_packs + bitmap_git->midx->num_packs_in_base; i++) {
|
||||
if (prepare_midx_pack(bitmap_repo(bitmap_git), bitmap_git->midx, i)) {
|
||||
if (prepare_midx_pack(bitmap_git->midx, i)) {
|
||||
warning(_("could not open pack %s"),
|
||||
bitmap_git->midx->pack_names[i]);
|
||||
goto cleanup;
|
||||
@@ -2466,7 +2466,7 @@ void reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
|
||||
struct multi_pack_index *m = bitmap_git->midx;
|
||||
for (i = 0; i < m->num_packs + m->num_packs_in_base; i++) {
|
||||
struct bitmapped_pack pack;
|
||||
if (nth_bitmapped_pack(r, bitmap_git->midx, &pack, i) < 0) {
|
||||
if (nth_bitmapped_pack(bitmap_git->midx, &pack, i) < 0) {
|
||||
warning(_("unable to load pack: '%s', disabling pack-reuse"),
|
||||
bitmap_git->midx->pack_names[i]);
|
||||
free(packs);
|
||||
|
||||
Reference in New Issue
Block a user