@matheusbsbs / matheus-bagliano / commits / eddad36860

builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`

`builtin/repack.c`'s `write_cruft_pack()` is used to generate the cruft pack when `--cruft` is supplied. It uses a static variable "cruft_expiration" which is filled in by option parsing. A future patch will add an `--expire-to` option which allows `git repack` to write a cruft pack containing the pruned objects out to a separate repository. In order to implement this functionality, some callers will have to pass a value for `cruft_expiration` different than the one filled out by option parsing. Prepare for this by teaching `write_cruft_pack` to take a "cruft_expiration" parameter, instead of reading a single static variable. The (sole) existing caller of `write_cruft_pack()` will pass the value for "cruft_expiration" filled in by option parsing, retaining existing behavior. This means that we can make the variable local to `cmd_repack()`, and eliminate the static declaration. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Oct 24, 2022 at 14:43 UTC eddad3686080553bb1e6ffa6d9394912f9427823

1 file changed +4 -2

builtin/repack.c

+4 -2

@@ -32,7 +32,6 @@ static int write_bitmaps = -1;

32 static int use_delta_islands;

33 static int run_update_server_info = 1;

34 static char *packdir, *packtmp_name, *packtmp;

35 -static char *cruft_expiration;

36 static const char *const git_repack_usage[] = {

37 N_("git repack [<options>]"),

@@ -664,6 +663,7 @@ static int write_midx_included_packs(struct string_list *include,

663

664 static int write_cruft_pack(const struct pack_objects_args *args,

665 const char *pack_prefix,

666 + const char *cruft_expiration,

667 struct string_list *names,

668 struct string_list *existing_packs,

669 struct string_list *existing_kept_packs)

@@ -746,6 +746,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

746 struct pack_objects_args cruft_po_args = {NULL};

747 int geometric_factor = 0;

748 int write_midx = 0;

749 + const char *cruft_expiration = NULL;

750

751 struct option builtin_repack_options[] = {

752 OPT_BIT('a', NULL, &pack_everything,

@@ -985,7 +986,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

986 cruft_po_args.local = po_args.local;

987 cruft_po_args.quiet = po_args.quiet;

988

988 - ret = write_cruft_pack(&cruft_po_args, pack_prefix, &names,

989 + ret = write_cruft_pack(&cruft_po_args, pack_prefix,

990 + cruft_expiration, &names,

991 &existing_nonkept_packs,

992 &existing_kept_packs);

993 if (ret)