config: pass repo to `git_config_get_expiry()`
Refactor `git_config_get_expiry()` to accept a `struct repository` such that we can get rid of the implicit dependency on `the_repository`. Rename the function accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Aug 13, 2024 at 11:13 UTC
87aace129ef39fc52ca26e8d31c356c8d05ea910
4 files changed
+8
-8
builtin/gc.c
+3
-3
@@ -167,9 +167,9 @@ static void gc_config(void)
167
git_config_get_bool("gc.autodetach", &detach_auto);
168
git_config_get_bool("gc.cruftpacks", &cruft_packs);
169
git_config_get_ulong("gc.maxcruftsize", &max_cruft_size);
170
- git_config_get_expiry("gc.pruneexpire", &prune_expire);
171
- git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
172
- git_config_get_expiry("gc.logexpiry", &gc_log_expire);
170
+ repo_config_get_expiry(the_repository, "gc.pruneexpire", &prune_expire);
171
+ repo_config_get_expiry(the_repository, "gc.worktreepruneexpire", &prune_worktrees_expire);
172
+ repo_config_get_expiry(the_repository, "gc.logexpiry", &gc_log_expire);
173
174
git_config_get_ulong("gc.bigpackthreshold", &big_pack_threshold);
175
git_config_get_ulong("pack.deltacachesize", &max_delta_cache_size);
config.c
+2
-2
@@ -2766,9 +2766,9 @@ int git_config_get_pathname(const char *key, char **dest)
2766
return repo_config_get_pathname(the_repository, key, dest);
2767
}
2768
2769
-int git_config_get_expiry(const char *key, const char **output)
2769
+int repo_config_get_expiry(struct repository *r, const char *key, const char **output)
2770
{
2771
- int ret = git_config_get_string(key, (char **)output);
2771
+ int ret = repo_config_get_string(r, key, (char **)output);
2772
if (ret)
2773
return ret;
2774
if (strcmp(*output, "now")) {
config.h
+1
-1
@@ -715,7 +715,7 @@ int repo_config_get_split_index(struct repository *r);
715
int repo_config_get_max_percent_split_change(struct repository *r);
716
717
/* This dies if the configured or default date is in the future */
718
-int git_config_get_expiry(const char *key, const char **output);
718
+int repo_config_get_expiry(struct repository *r, const char *key, const char **output);
719
720
/* parse either "this many days" integer, or "5.days.ago" approxidate */
721
int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now);
read-cache.c
+2
-2
@@ -3184,8 +3184,8 @@ static unsigned long get_shared_index_expire_date(void)
3184
static int shared_index_expire_date_prepared;
3185
3186
if (!shared_index_expire_date_prepared) {
3187
- git_config_get_expiry("splitindex.sharedindexexpire",
3188
- &shared_index_expire);
3187
+ repo_config_get_expiry(the_repository, "splitindex.sharedindexexpire",
3188
+ &shared_index_expire);
3189
shared_index_expire_date = approxidate(shared_index_expire);
3190
shared_index_expire_date_prepared = 1;
3191
}