From 6b583e1d46bcc9209c82a939bfc3d63d0c4bec5c Mon Sep 17 00:00:00 2001 From: Shashank S Mogaveera Date: Mon, 19 Oct 2026 22:11:04 +0530 Subject: [PATCH] [Outreachy Patch] prune-packed: remove USE_THE_REPOSITORY_VARIABLE The prune_packed_objects() function uses the global the_repository variable. To help with the libification effort, change this function so it takes a 'struct repository' pointer as an argument instead. The function for_each_loose_file_in_source() uses a callback that only takes a single 'void *data' pointer. This means we cannot pass both the repository pointer and the 'opts' integer at the same time. To fix this, create a new 'struct prune_data' to hold both of them together, and update the prune_subdir() and prune_object() callbacks to read from this new struct. Update the builtins that call this function (builtin/prune-packed.c, builtin/prune.c, and builtin/repack.c) to pass their local 'repo' variables. We can safely remove the UNUSED macro from them because these commands are all declared with the RUN_SETUP flag in git.c, which guarantees that the 'repo' pointer will never be NULL. Finally, drop the USE_THE_REPOSITORY_VARIABLE macro from prune-packed.c. Signed-off-by: Shashank S Mogaveera --- builtin/prune-packed.c | 4 ++-- builtin/prune.c | 2 +- builtin/repack.c | 2 +- prune-packed.c | 32 ++++++++++++++++++++------------ prune-packed.h | 4 +++- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c index 4d63f26b0a120c..d44e7f81d4836c 100644 --- a/builtin/prune-packed.c +++ b/builtin/prune-packed.c @@ -11,7 +11,7 @@ static const char * const prune_packed_usage[] = { int cmd_prune_packed(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { int opts = isatty(2) ? PRUNE_PACKED_VERBOSE : 0; const struct option prune_packed_options[] = { @@ -30,6 +30,6 @@ int cmd_prune_packed(int argc, prune_packed_usage, prune_packed_options); - prune_packed_objects(opts); + prune_packed_objects(repo, opts); return 0; } diff --git a/builtin/prune.c b/builtin/prune.c index a7e4678d117072..4eee5a2e27a058 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -201,7 +201,7 @@ int cmd_prune(int argc, for_each_loose_file_in_source(repo->objects->sources, prune_object, prune_cruft, prune_subdir, &revs); - prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0); + prune_packed_objects(repo, show_only ? PRUNE_PACKED_DRY_RUN : 0); remove_temporary_files(repo_get_object_directory(repo)); s = mkpathdup("%s/pack", repo_get_object_directory(repo)); remove_temporary_files(s); diff --git a/builtin/repack.c b/builtin/repack.c index c4360382c1fce2..e8970e8eb7ea1f 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -757,7 +757,7 @@ int cmd_repack(int argc, wrote_incremental_midx); if (show_progress) opts |= PRUNE_PACKED_VERBOSE; - prune_packed_objects(opts); + prune_packed_objects(repo, opts); if (!keep_unreachable && (!(pack_everything & LOOSEN_UNREACHABLE) || diff --git a/prune-packed.c b/prune-packed.c index d49dc11957c7a6..a53b7031b5869d 100644 --- a/prune-packed.c +++ b/prune-packed.c @@ -1,5 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE - #include "git-compat-util.h" #include "gettext.h" #include "object-file.h" @@ -8,40 +6,50 @@ #include "prune-packed.h" #include "repository.h" +struct prune_data { + struct repository *r; + int opts; +}; + static struct progress *progress; static int prune_subdir(unsigned int nr, const char *path, void *data) { - int *opts = data; + struct prune_data *d = data; display_progress(progress, nr + 1); - if (!(*opts & PRUNE_PACKED_DRY_RUN)) + if (!(d->opts & PRUNE_PACKED_DRY_RUN)) rmdir(path); return 0; } static int prune_object(const struct object_id *oid, const char *path, - void *data) + void *data) { - int *opts = data; + struct prune_data *d = data; - if (!has_object_pack(the_repository, oid)) + if (!has_object_pack(d->r, oid)) return 0; - if (*opts & PRUNE_PACKED_DRY_RUN) + if (d->opts & PRUNE_PACKED_DRY_RUN) printf("rm -f %s\n", path); else unlink_or_warn(path); return 0; } -void prune_packed_objects(int opts) +void prune_packed_objects(struct repository *r, int opts) { + struct prune_data cb_data = { + .r = r, + .opts = opts + }; + if (opts & PRUNE_PACKED_VERBOSE) - progress = start_delayed_progress(the_repository, + progress = start_delayed_progress(r, _("Removing duplicate objects"), 256); - for_each_loose_file_in_source(the_repository->objects->sources, - prune_object, NULL, prune_subdir, &opts); + for_each_loose_file_in_source(r->objects->sources, + prune_object, NULL, prune_subdir, &cb_data); /* Ensure we show 100% before finishing progress */ display_progress(progress, 256); diff --git a/prune-packed.h b/prune-packed.h index 936fa9df23e8df..9ec7ff0d602bca 100644 --- a/prune-packed.h +++ b/prune-packed.h @@ -1,9 +1,11 @@ #ifndef PRUNE_PACKED_H #define PRUNE_PACKED_H +struct repository; + #define PRUNE_PACKED_DRY_RUN 01 #define PRUNE_PACKED_VERBOSE 02 -void prune_packed_objects(int); +void prune_packed_objects(struct repository *r, int opts); #endif