mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
builtin/repack.c: pass 'pack_kept_objects' to pack_geometry_init()
Prepare to move pack_geometry-related APIs to their own compilation unit by passing in the static "pack_kept_objects" variable directly as a parameter to the 'pack_geometry_init()' function. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
e05c2d5566
commit
2a15a739a2
@@ -136,7 +136,8 @@ static int pack_geometry_cmp(const void *va, const void *vb)
|
||||
|
||||
static void pack_geometry_init(struct pack_geometry *geometry,
|
||||
struct existing_packs *existing,
|
||||
const struct pack_objects_args *args)
|
||||
const struct pack_objects_args *args,
|
||||
int pack_kept_objects)
|
||||
{
|
||||
struct packfile_store *packs = existing->repo->objects->packfiles;
|
||||
struct packed_git *p;
|
||||
@@ -1063,7 +1064,8 @@ int cmd_repack(int argc,
|
||||
if (geometry.split_factor) {
|
||||
if (pack_everything)
|
||||
die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");
|
||||
pack_geometry_init(&geometry, &existing, &po_args);
|
||||
pack_geometry_init(&geometry, &existing, &po_args,
|
||||
pack_kept_objects);
|
||||
pack_geometry_split(&geometry);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user