undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
`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>
This commit is contained in:
Taylor Blau 2022-10-24 14:43:06 -04:00 committed by Junio C Hamano
parent 4e7b65ba8e
commit eddad36860
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/repack.c
View File

@ -32,7 +32,6 @@ static int write_bitmaps = -1;
static int use_delta_islands; static int use_delta_islands;
static int run_update_server_info = 1; static int run_update_server_info = 1;
static char *packdir, *packtmp_name, *packtmp; static char *packdir, *packtmp_name, *packtmp;
static char *cruft_expiration;
static const char *const git_repack_usage[] = { static const char *const git_repack_usage[] = {
N_("git repack [<options>]"), N_("git repack [<options>]"),
@ -664,6 +663,7 @@ static int write_midx_included_packs(struct string_list *include,
static int write_cruft_pack(const struct pack_objects_args *args, static int write_cruft_pack(const struct pack_objects_args *args,
const char *pack_prefix, const char *pack_prefix,
const char *cruft_expiration,
struct string_list *names, struct string_list *names,
struct string_list *existing_packs, struct string_list *existing_packs,
struct string_list *existing_kept_packs) struct string_list *existing_kept_packs)
@ -746,6 +746,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
struct pack_objects_args cruft_po_args = {NULL}; struct pack_objects_args cruft_po_args = {NULL};
int geometric_factor = 0; int geometric_factor = 0;
int write_midx = 0; int write_midx = 0;
const char *cruft_expiration = NULL;
struct option builtin_repack_options[] = { struct option builtin_repack_options[] = {
OPT_BIT('a', NULL, &pack_everything, OPT_BIT('a', NULL, &pack_everything,
@ -985,7 +986,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
cruft_po_args.local = po_args.local; cruft_po_args.local = po_args.local;
cruft_po_args.quiet = po_args.quiet; cruft_po_args.quiet = po_args.quiet;
ret = write_cruft_pack(&cruft_po_args, pack_prefix, &names, ret = write_cruft_pack(&cruft_po_args, pack_prefix,
cruft_expiration, &names,
&existing_nonkept_packs, &existing_nonkept_packs,
&existing_kept_packs); &existing_kept_packs);
if (ret) if (ret)