diff options
| author | David Bryson <david@statichacks.org> | 2008-09-30 13:28:58 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-30 13:41:50 -0700 |
| commit | d3154b44c28affc94a4fbaf26706f075b58733a7 (patch) | |
| tree | eef8e729077fe9a7e338d0c7bf908c71d6ff609f | |
| parent | 87539416fd25bfa62122ddf4f7a7b8794d5d5aa2 (diff) | |
| download | git-d3154b44c28affc94a4fbaf26706f075b58733a7.tar.gz git-d3154b44c28affc94a4fbaf26706f075b58733a7.tar.xz | |
Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
Signed-off-by: David Bryson <david@statichacks.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | builtin-gc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin-gc.c b/builtin-gc.c index fac200e0b..7af65bb31 100644 --- a/builtin-gc.c +++ b/builtin-gc.c @@ -26,7 +26,7 @@ static int pack_refs = 1; static int aggressive_window = -1; static int gc_auto_threshold = 6700; static int gc_auto_pack_limit = 50; -static char *prune_expire = "2.weeks.ago"; +static const char *prune_expire = "2.weeks.ago"; #define MAX_ADD 10 static const char *argv_pack_refs[] = {"pack-refs", "--all", "--prune", NULL}; @@ -57,15 +57,12 @@ static int gc_config(const char *var, const char *value, void *cb) return 0; } if (!strcmp(var, "gc.pruneexpire")) { - if (!value) - return config_error_nonbool(var); - if (strcmp(value, "now")) { + if (value && strcmp(value, "now")) { unsigned long now = approxidate("now"); if (approxidate(value) >= now) return error("Invalid %s: '%s'", var, value); } - prune_expire = xstrdup(value); - return 0; + return git_config_string(&prune_expire, var, value); } return git_default_config(var, value, cb); } |