Skip to content

Commit

Permalink
gc: factor out gc.pruneexpire parsing code
Browse files Browse the repository at this point in the history
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Dec 1, 2014
1 parent 2cfe2a7 commit 09dbb90
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions builtin/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@ static void remove_pidfile_on_signal(int signo)
raise(signo);
}

static void git_config_date_string(const char *key, const char **output)
{
if (git_config_get_string_const(key, output))
return;
if (strcmp(*output, "now")) {
unsigned long now = approxidate("now");
if (approxidate(*output) >= now)
git_die_config(key, _("Invalid %s: '%s'"), key, *output);
}
}

static void gc_config(void)
{
const char *value;
Expand All @@ -71,16 +82,7 @@ static void gc_config(void)
git_config_get_int("gc.auto", &gc_auto_threshold);
git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
git_config_get_bool("gc.autodetach", &detach_auto);

if (!git_config_get_string_const("gc.pruneexpire", &prune_expire)) {
if (strcmp(prune_expire, "now")) {
unsigned long now = approxidate("now");
if (approxidate(prune_expire) >= now) {
git_die_config("gc.pruneexpire", _("Invalid gc.pruneexpire: '%s'"),
prune_expire);
}
}
}
git_config_date_string("gc.pruneexpire", &prune_expire);
git_config(git_default_config, NULL);
}

Expand Down

0 comments on commit 09dbb90

Please sign in to comment.