From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id AFE22201C8 for ; Sun, 12 Nov 2017 13:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751146AbdKLNz4 (ORCPT ); Sun, 12 Nov 2017 08:55:56 -0500 Received: from ikke.info ([178.21.113.177]:50666 "EHLO vps892.directvps.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbdKLNzz (ORCPT ); Sun, 12 Nov 2017 08:55:55 -0500 Received: by vps892.directvps.nl (Postfix, from userid 1008) id B8FA3440808; Sun, 12 Nov 2017 14:55:53 +0100 (CET) Date: Sun, 12 Nov 2017 14:55:53 +0100 From: Kevin Daudt To: Haaris Cc: git@vger.kernel.org Subject: Re: [PATCH] config: added --expiry-date type support Message-ID: <20171112135553.GA10563@alpha.vpn.ikke.info> References: <0102015fb02bb5be-02c77f83-5a20-4ca1-8bab-5e9519cbd758-000000@eu-west-1.amazonses.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0102015fb02bb5be-02c77f83-5a20-4ca1-8bab-5e9519cbd758-000000@eu-west-1.amazonses.com> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sun, Nov 12, 2017 at 12:19:35PM +0000, Haaris wrote: > --- > builtin/config.c | 11 ++++++++++- > config.c | 9 +++++++++ > config.h | 1 + > t/t1300-repo-config.sh | 25 +++++++++++++++++++++++++ > 4 files changed, 45 insertions(+), 1 deletion(-) > > diff --git a/builtin/config.c b/builtin/config.c > index d13daeeb55927..41cd9f5ca7cde 100644 > --- a/builtin/config.c > +++ b/builtin/config.c > @@ -52,6 +52,7 @@ static int show_origin; > #define TYPE_INT (1<<1) > #define TYPE_BOOL_OR_INT (1<<2) > #define TYPE_PATH (1<<3) > +#define TYPE_EXPIRY_DATE (1<<4) > > static struct option builtin_config_options[] = { > OPT_GROUP(N_("Config file location")), > @@ -80,6 +81,7 @@ static struct option builtin_config_options[] = { > OPT_BIT(0, "int", &types, N_("value is decimal number"), TYPE_INT), > OPT_BIT(0, "bool-or-int", &types, N_("value is --bool or --int"), TYPE_BOOL_OR_INT), > OPT_BIT(0, "path", &types, N_("value is a path (file or directory name)"), TYPE_PATH), > + OPT_BIT(0, "expiry-date", &types, N_("value is an expiry date"), TYPE_EXPIRY_DATE), > OPT_GROUP(N_("Other")), > OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")), > OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")), > @@ -159,6 +161,12 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value > return -1; > strbuf_addstr(buf, v); > free((char *)v); > + } else if (types == TYPE_EXPIRY_DATE) { > + timestamp_t *t = malloc(sizeof(*t)); > + if(git_config_expiry_date(&t, key_, value_) < 0) > + return -1; > + strbuf_addf(buf, "%"PRItime, *t); > + free((timestamp_t *)t); > } else if (value_) { > strbuf_addstr(buf, value_); > } else { > @@ -273,12 +281,13 @@ static char *normalize_value(const char *key, const char *value) > if (!value) > return NULL; > > - if (types == 0 || types == TYPE_PATH) > + if (types == 0 || types == TYPE_PATH || types == TYPE_EXPIRY_DATE) > /* > * We don't do normalization for TYPE_PATH here: If > * the path is like ~/foobar/, we prefer to store > * "~/foobar/" in the config file, and to expand the ~ > * when retrieving the value. > + * Also don't do normalization for expiry dates. > */ > return xstrdup(value); > if (types == TYPE_INT) > diff --git a/config.c b/config.c > index 903abf9533b18..caa2fd5fb6915 100644 > --- a/config.c > +++ b/config.c > @@ -990,6 +990,15 @@ int git_config_pathname(const char **dest, const char *var, const char *value) > return 0; > } > > +int git_config_expiry_date(timestamp_t **timestamp, const char *var, const char *value) > +{ > + if (!value) > + return config_error_nonbool(var); > + if (!!parse_expiry_date(value, *timestamp)) > + die(_("failed to parse date_string in: '%s'"), value); > + return 0; > +} > + > static int git_default_core_config(const char *var, const char *value) > { > /* This needs a better name */ > diff --git a/config.h b/config.h > index a49d264416225..2d127d9d23c90 100644 > --- a/config.h > +++ b/config.h > @@ -58,6 +58,7 @@ extern int git_config_bool_or_int(const char *, const char *, int *); > extern int git_config_bool(const char *, const char *); > extern int git_config_string(const char **, const char *, const char *); > extern int git_config_pathname(const char **, const char *, const char *); > +extern int git_config_expiry_date(timestamp_t **, const char *, const char *); > extern int git_config_set_in_file_gently(const char *, const char *, const char *); > extern void git_config_set_in_file(const char *, const char *, const char *); > extern int git_config_set_gently(const char *, const char *); > diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh > index 364a537000bbb..59a35be89e511 100755 > --- a/t/t1300-repo-config.sh > +++ b/t/t1300-repo-config.sh > @@ -901,6 +901,31 @@ test_expect_success 'get --path barfs on boolean variable' ' > test_must_fail git config --get --path path.bool > ' > > +test_expect_success 'get --expiry-date' ' > + cat >.git/config <<-\EOF && > + [date] > + valid1 = "Fri Jun 4 15:46:55 2010" > + valid2 = "2017/11/11 11:11:11PM" > + valid3 = "2017/11/10 09:08:07 PM" > + valid4 = "never" > + invalid1 = "abc" > + EOF > + cat >expect <<-\EOF && > + 1275666415 > + 1510441871 > + 1510348087 > + 0 > + EOF > + { > + git config --expiry-date date.valid1 && > + git config --expiry-date date.valid2 && > + git config --expiry-date date.valid3 && > + git config --expiry-date date.valid4 > + } >actual && > + test_cmp expect actual && > + test_must_fail git config --expiry-date date.invalid1 > +' > + > cat > expect << EOF > [quote] > leading = " test" > > -- > https://github.com/git/git/pull/433 Welcome and thanks for your submission. There are a couple of issues, which you can read about in the SubmittingPatches[0] documentation. The first and most foremost is that your signed-off-by is missing, which is a requirement to show that you have the right to submit this code. The commit subject should be in the present tense, as a command to the code base, like so: config: add --expiry-date type support What I'm also missing is a motivation on why you added this option, which should be part of your commit message. As far as I know, there is currently no config setting that expects a date format. Kevin [0]:https://github.com/git/git/blob/master/Documentation/SubmittingPatches