[PATCH 02/21] gc: use repository in too_many_loose_objects()
STALE2249d
From: Derrick Stolee via GitGitGadget <hidden>
Date: 2020-07-07 14:21:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v1 of 3 in this series.
Revisions (3)
- v1 current
- v2 [diff vs current]
- v3 [diff vs current]
From: Derrick Stolee <redacted> The previous change performed a mechanical change to swap the_repository for a struct repository pointer when the use of the_repository was obvious. However, the too_many_loose_objects() method uses git_path() instead of repo_git_path(), which implies a hidden dependence on the_repository. Signed-off-by: Derrick Stolee <redacted> --- builtin/gc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index 5c5e0df5bf..6d8267cecb 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c@@ -159,7 +159,7 @@ static void gc_config(void) git_config(git_default_config, NULL); } -static int too_many_loose_objects(void) +static int too_many_loose_objects(struct repository *r) { /* * Quickly check if a "gc" is needed, by estimating how
@@ -174,7 +174,7 @@ static int too_many_loose_objects(void) int needed = 0; const unsigned hexsz_loose = the_hash_algo->hexsz - 2; - dir = opendir(git_path("objects/17")); + dir = opendir(repo_git_path(r, "objects/17")); if (!dir) return 0;
@@ -378,7 +378,7 @@ static int need_to_gc(struct repository *r) add_repack_all_option(&keep_pack); string_list_clear(&keep_pack, 0); - } else if (too_many_loose_objects()) + } else if (too_many_loose_objects(r)) add_repack_incremental_option(); else return 0;
@@ -692,7 +692,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0, NULL); - if (auto_gc && too_many_loose_objects()) + if (auto_gc && too_many_loose_objects(r)) warning(_("There are too many unreachable loose objects; " "run 'git prune' to remove them."));
--
gitgitgadget