@matheusbsbs / matheus-bagliano / commits / e35ef71e00

repack: move 'delta_base_offset' to 'struct pack_objects_args'

The static variable 'delta_base_offset' determines whether or not we pass the "--delta-base-offset" command-line argument when spawning pack-objects as a child process. Its introduction dates back to when repack was rewritten in C, all the way back in a1bbc6c017 (repack: rewrite the shell script in C, 2013-09-15). 'struct pack_objects_args' was introduced much later on in 4571324b99 (builtin/repack.c: allow configuring cruft pack generation, 2022-05-20), but did not move the 'delta_base_offset' variable. Since the 'delta_base_offset' is a property of an individual pack-objects command, re-introduce that variable as a member of 'struct pack_objects_args', which will enable further code movement in the subsequent commits. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Oct 15, 2025 at 18:27 UTC e35ef71e003cb0731d9f33605f598e1b99746441

2 files changed +9 -5

builtin/repack.c

+6 -5

@@ -34,7 +34,6 @@

34 #define RETAIN_PACK 2

36 static int pack_everything;

37 -static int delta_base_offset = 1;

37 static int pack_kept_objects = -1;

38 static int write_bitmaps = -1;

39 static int use_delta_islands;

@@ -63,9 +62,10 @@ static int repack_config(const char *var, const char *value,

62 const struct config_context *ctx, void *cb)

63 {

64 struct repack_config_ctx *repack_ctx = cb;

65 + struct pack_objects_args *po_args = repack_ctx->po_args;

66 struct pack_objects_args *cruft_po_args = repack_ctx->cruft_po_args;

67 if (!strcmp(var, "repack.usedeltabaseoffset")) {

68 - delta_base_offset = git_config_bool(var, value);

68 + po_args->delta_base_offset = git_config_bool(var, value);

69 return 0;

70 }

71 if (!strcmp(var, "repack.packkeptobjects")) {

@@ -315,7 +315,7 @@ static void prepare_pack_objects(struct child_process *cmd,

315 strvec_push(&cmd->args, "--local");

316 if (args->quiet)

317 strvec_push(&cmd->args, "--quiet");

318 - if (delta_base_offset)

318 + if (args->delta_base_offset)

319 strvec_push(&cmd->args, "--delta-base-offset");

320 strvec_push(&cmd->args, out);

321 cmd->git_cmd = 1;

@@ -1271,8 +1271,8 @@ int cmd_repack(int argc,

1271 const char *unpack_unreachable = NULL;

1272 int keep_unreachable = 0;

1273 struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;

1274 - struct pack_objects_args po_args = { 0 };

1275 - struct pack_objects_args cruft_po_args = { 0 };

1274 + struct pack_objects_args po_args = PACK_OBJECTS_ARGS_INIT;

1275 + struct pack_objects_args cruft_po_args = PACK_OBJECTS_ARGS_INIT;

1276 int write_midx = 0;

1277 const char *cruft_expiration = NULL;

1278 const char *expire_to = NULL;

@@ -1567,6 +1567,7 @@ int cmd_repack(int argc,

1567

1568 cruft_po_args.local = po_args.local;

1569 cruft_po_args.quiet = po_args.quiet;

1570 + cruft_po_args.delta_base_offset = po_args.delta_base_offset;

1571

1572 ret = write_cruft_pack(&cruft_po_args, packtmp, pack_prefix,

1573 cruft_expiration,

repack.h

@@ -15,9 +15,12 @@ struct pack_objects_args {

15 int local;

16 int name_hash_version;

17 int path_walk;

18 + int delta_base_offset;

19 struct list_objects_filter_options filter_options;

20 };

22 +#define PACK_OBJECTS_ARGS_INIT { .delta_base_offset = 1 }

23 +

24 void pack_objects_args_release(struct pack_objects_args *args);

26 #endif /* REPACK_H */