mirror of
https://github.com/git/git.git
synced 2024-10-18 13:28:56 +02:00
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>
This commit is contained in:
parent
d8b772182c
commit
87aace129e
@ -167,9 +167,9 @@ static void gc_config(void)
|
||||
git_config_get_bool("gc.autodetach", &detach_auto);
|
||||
git_config_get_bool("gc.cruftpacks", &cruft_packs);
|
||||
git_config_get_ulong("gc.maxcruftsize", &max_cruft_size);
|
||||
git_config_get_expiry("gc.pruneexpire", &prune_expire);
|
||||
git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
|
||||
git_config_get_expiry("gc.logexpiry", &gc_log_expire);
|
||||
repo_config_get_expiry(the_repository, "gc.pruneexpire", &prune_expire);
|
||||
repo_config_get_expiry(the_repository, "gc.worktreepruneexpire", &prune_worktrees_expire);
|
||||
repo_config_get_expiry(the_repository, "gc.logexpiry", &gc_log_expire);
|
||||
|
||||
git_config_get_ulong("gc.bigpackthreshold", &big_pack_threshold);
|
||||
git_config_get_ulong("pack.deltacachesize", &max_delta_cache_size);
|
||||
|
4
config.c
4
config.c
@ -2766,9 +2766,9 @@ int git_config_get_pathname(const char *key, char **dest)
|
||||
return repo_config_get_pathname(the_repository, key, dest);
|
||||
}
|
||||
|
||||
int git_config_get_expiry(const char *key, const char **output)
|
||||
int repo_config_get_expiry(struct repository *r, const char *key, const char **output)
|
||||
{
|
||||
int ret = git_config_get_string(key, (char **)output);
|
||||
int ret = repo_config_get_string(r, key, (char **)output);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (strcmp(*output, "now")) {
|
||||
|
2
config.h
2
config.h
@ -715,7 +715,7 @@ int repo_config_get_split_index(struct repository *r);
|
||||
int repo_config_get_max_percent_split_change(struct repository *r);
|
||||
|
||||
/* This dies if the configured or default date is in the future */
|
||||
int git_config_get_expiry(const char *key, const char **output);
|
||||
int repo_config_get_expiry(struct repository *r, const char *key, const char **output);
|
||||
|
||||
/* parse either "this many days" integer, or "5.days.ago" approxidate */
|
||||
int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now);
|
||||
|
@ -3184,8 +3184,8 @@ static unsigned long get_shared_index_expire_date(void)
|
||||
static int shared_index_expire_date_prepared;
|
||||
|
||||
if (!shared_index_expire_date_prepared) {
|
||||
git_config_get_expiry("splitindex.sharedindexexpire",
|
||||
&shared_index_expire);
|
||||
repo_config_get_expiry(the_repository, "splitindex.sharedindexexpire",
|
||||
&shared_index_expire);
|
||||
shared_index_expire_date = approxidate(shared_index_expire);
|
||||
shared_index_expire_date_prepared = 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user