Re: [PATCH] Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Sep 30, 2008, 19:37 UTC
- Message-ID
- <20080930193725.GJ21310@spearce.org>
- In-Reply-To
- <20080930190549.GA9869@eratosthenes.cryptobackpack.org>
David Bryson <david@statichacks.org> wrote:
Show 5 quoted lines
> Hi all, > This is a quick janitor patch and my first patch sent to the git mailing > list. Please let me know if I have done any process of the patch > submission wrong, and if I got the Janitorial task done in the proper > fashion.
This part of the message probably should go after the "---" line. Everything above "---" goes into the commit message, everything after it is automatically cut by git-am.
This sort of "Hi, I'm new" isn't very useful in the long term in the project logs, but its still useful to introduce yourself. ;-)
Show 27 quoted lines
> Signed-off-by: David Bryson <david@statichacks.org>
> ---
> builtin-gc.c | 7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/builtin-gc.c b/builtin-gc.c
> index fac200e..6260652 100644
> --- a/builtin-gc.c
> +++ b/builtin-gc.c
> @@ -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);
> }-- Shawn.