Re: [PATCH v2 09/11] parse-options.h: add macros for '--contains' option

[Christian Couder <christian.couder@gmail.com>]

On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak <karthik.188@gmail.com> wrote:
> Add a macro for using the '--contains' option in parse-options.h
> also include an optional '--with' option macro which performs the
> same action as '--contains'.
>
> Make tag.c use this new macro
>
> Mentored-by: Christian Couder <christian.couder@gmail.com>
> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
> Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
> ---
>  builtin/tag.c   | 14 ++------------
>  parse-options.h |  7 +++++++
>  2 files changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/builtin/tag.c b/builtin/tag.c
> index 2d6610a..767162e 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -595,23 +595,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>
>                 OPT_GROUP(N_("Tag listing options")),
>                 OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
> +               OPT_CONTAINS(&with_commit, N_("print only tags that contain the commit")),
> +               OPT_WITH(&with_commit, N_("print only tags that contain the commit")),
>                 {
>                         OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"),
>                         PARSE_OPT_NONEG, parse_opt_sort
>                 },
>                 {
> -                       OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
> -                       N_("print only tags that contain the commit"),
> -                       PARSE_OPT_LASTARG_DEFAULT,
> -                       parse_opt_commit_object_name, (intptr_t)"HEAD",
> -               },
> -               {
> -                       OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
> -                       N_("print only tags that contain the commit"),
> -                       PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,

The PARSE_OPT_HIDDEN flag is removed below. This means that "--with"
will appear in the "git tag -h" output, which means that "--with"
should appear in the documentation...
The commit message may also want to tell that with is not hidden any more.

> -                       parse_opt_commit_object_name, (intptr_t)"HEAD",
> -               },
> -               {
>                         OPTION_CALLBACK, 0, "points-at", &points_at, N_("object"),
>                         N_("print only tags of the object"), 0, parse_opt_object_name
>                 },
> diff --git a/parse-options.h b/parse-options.h
> index 8542d9c..d76e907 100644
> --- a/parse-options.h
> +++ b/parse-options.h
> @@ -243,5 +243,12 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int);
>         OPT_COLOR_FLAG(0, "color", (var), (h))
>  #define OPT_COLUMN(s, l, v, h) \
>         { OPTION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG, parseopt_column_callback }
> +#define _OPT_CONTAINS_OR_WITH(name, variable, help) \
> +       { OPTION_CALLBACK, 0, name, (variable), N_("commit"), (help), \
> +         PARSE_OPT_LASTARG_DEFAULT, \
> +         parse_opt_commit_object_name, (intptr_t) "HEAD" \
> +       }
> +#define OPT_CONTAINS(v, h) _OPT_CONTAINS_OR_WITH("contains", v, h)
> +#define OPT_WITH(v, h) _OPT_CONTAINS_OR_WITH("contains", v, h)

Shouldn't it be "with" instead of "contains"?