From: Jeff King Date: Thu, 9 Sep 2021 19:56:58 +0000 (-0400) Subject: pack-bitmap: drop repository argument from prepare_midx_bitmap_git() X-Git-Tag: v2.34.0-rc0~160^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfbb60d328426f0fcc708e2da13d0063ba63e9db;p=thirdparty%2Fgit.git pack-bitmap: drop repository argument from prepare_midx_bitmap_git() We never look at the repository argument which is passed. This makes sense, since the multi_pack_index struct already tells us everything we need to access the files in its associated object directory. Signed-off-by: Jeff King Reviewed-by: Taylor Blau Signed-off-by: Junio C Hamano --- diff --git a/midx.c b/midx.c index ccdc3e5702..864034a6ad 100644 --- a/midx.c +++ b/midx.c @@ -1144,7 +1144,7 @@ static int write_midx_internal(const char *object_dir, int bitmap_exists; int want_bitmap = flags & MIDX_WRITE_BITMAP; - bitmap_git = prepare_midx_bitmap_git(the_repository, ctx.m); + bitmap_git = prepare_midx_bitmap_git(ctx.m); bitmap_exists = bitmap_git && bitmap_is_midx(bitmap_git); free_bitmap_index(bitmap_git); diff --git a/pack-bitmap.c b/pack-bitmap.c index fa69ed7a6d..f2a7994a9c 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -517,8 +517,7 @@ struct bitmap_index *prepare_bitmap_git(struct repository *r) return NULL; } -struct bitmap_index *prepare_midx_bitmap_git(struct repository *r, - struct multi_pack_index *midx) +struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx) { struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git)); diff --git a/pack-bitmap.h b/pack-bitmap.h index 81664f933f..469090bad2 100644 --- a/pack-bitmap.h +++ b/pack-bitmap.h @@ -44,8 +44,7 @@ typedef int (*show_reachable_fn)( struct bitmap_index; struct bitmap_index *prepare_bitmap_git(struct repository *r); -struct bitmap_index *prepare_midx_bitmap_git(struct repository *r, - struct multi_pack_index *midx); +struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx); void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits, uint32_t *trees, uint32_t *blobs, uint32_t *tags); void traverse_bitmap_commit_list(struct bitmap_index *,