kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

repack: remove 'remove_redundant_pack' from the builtin 

Extract "remove_redundant_pack()" as generic repack-related
functionality by moving its implementation to the repack.[ch]
compilation unit.

This is a prerequisite to moving the "existing_packs" API, which is one
of the callers of this function. (The remaining caller in the pack
geometry code will eventually move to its own compilation unit as well,
and will likewise rely on this function.)

While moving it over, prefix the function name with "repack_" to
indicate that it belongs to the repack-subsystem.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
seen
Taylor Blau 2025-09-28 18:08:12 -04:00 committed by Junio C Hamano
parent f989b706d1
commit 7be7f73cf2
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/repack.c
View File

@ -208,20 +208,6 @@ static void existing_packs_mark_for_deletion(struct existing_packs *existing,
&existing->cruft_packs);
}

static void remove_redundant_pack(struct repository *repo,
const char *dir_name, const char *base_name)
{
struct strbuf buf = STRBUF_INIT;
struct odb_source *source = repo->objects->sources;
struct multi_pack_index *m = get_multi_pack_index(source);
strbuf_addf(&buf, "%s.pack", base_name);
if (m && source->local && midx_contains_pack(m, buf.buf))
clear_midx_file(repo);
strbuf_insertf(&buf, 0, "%s/", dir_name);
unlink_pack_path(buf.buf, 1);
strbuf_release(&buf);
}

static void remove_redundant_packs_1(struct repository *repo,
struct string_list *packs)
{
@ -229,7 +215,7 @@ static void remove_redundant_packs_1(struct repository *repo,
for_each_string_list_item(item, packs) {
if (!existing_pack_is_marked_for_deletion(item))
continue;
remove_redundant_pack(repo, packdir, item->string);
repack_remove_redundant_pack(repo, packdir, item->string);
}
}

@ -652,7 +638,7 @@ static void geometry_remove_redundant_packs(struct pack_geometry *geometry,
(string_list_has_string(&existing->kept_packs, buf.buf)))
continue;

remove_redundant_pack(existing->repo, packdir, buf.buf);
repack_remove_redundant_pack(existing->repo, packdir, buf.buf);
}

strbuf_release(&buf);

18
repack.c
View File

@ -1,5 +1,9 @@
#include "git-compat-util.h"
#include "midx.h"
#include "odb.h"
#include "packfile.h"
#include "repack.h"
#include "repository.h"
#include "run-command.h"

void prepare_pack_objects(struct child_process *cmd,
@ -44,3 +48,17 @@ void pack_objects_args_release(struct pack_objects_args *args)
free(args->threads);
list_objects_filter_release(&args->filter_options);
}

void repack_remove_redundant_pack(struct repository *repo, const char *dir_name,
const char *base_name)
{
struct strbuf buf = STRBUF_INIT;
struct odb_source *source = repo->objects->sources;
struct multi_pack_index *m = get_multi_pack_index(source);
strbuf_addf(&buf, "%s.pack", base_name);
if (m && source->local && midx_contains_pack(m, buf.buf))
clear_midx_file(repo);
strbuf_insertf(&buf, 0, "%s/", dir_name);
unlink_pack_path(buf.buf, 1);
strbuf_release(&buf);
}

3
repack.h
View File

@ -28,4 +28,7 @@ void prepare_pack_objects(struct child_process *cmd,
const char *out);
void pack_objects_args_release(struct pack_objects_args *args);

void repack_remove_redundant_pack(struct repository *repo, const char *dir_name,
const char *base_name);

#endif /* REPACK_H */