On 08/07/2013 01:31 AM, Junio C Hamano wrote:
> The parseopt parsing for OPT__FORCE() is implemented in terms of
> OPT_BOOLEAN() and users of it can take advantage of the "counting
> up" behaviour to implement increasing levels of forcefulness by
> differentiating "git cmd -f" and "git cmd -f -f".
>
> Clarify this by explicitly using OPT_COUNTUP() instead.
>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
>
> * This _should_ be done with a similar audit of existing callers,
> but I ran out of concentration.
>
> parse-options.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/parse-options.h b/parse-options.h
> index 78f52c2..1eeb0d9 100644
> --- a/parse-options.h
> +++ b/parse-options.h
> @@ -238,7 +238,7 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int);
> { OPTION_CALLBACK, 'q', "quiet", (var), NULL, N_("be more quiet"), \
> PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }
> #define OPT__DRY_RUN(var, h) OPT_BOOL('n', "dry-run", (var), (h))
> -#define OPT__FORCE(var, h) OPT_BOOLEAN('f', "force", (var), (h))
> +#define OPT__FORCE(var, h) OPT_COUNTUP('f', "force", (var), (h))
> #define OPT__ABBREV(var) \
> { OPTION_CALLBACK, 0, "abbrev", (var), N_("n"), \
> N_("use <n> digits to display SHA-1s"), \
>
We need the COUNTUP, because in builtin/clean.c we have
OPT__FORCE(&force, N_("force")),
...
if (force > 1)
rm_flags = 0;
So a OPT_BOOL definitely doesn't cut it.
Now that I started reviewing the OPT_FORCE parts, I realize
there is still an error in the patch, which needed correction.
(branch, commit, name-rev: ease up boolean conditions):
- if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1)
+ if (force_create + list + unset_upstream +
+ !!delete + !!rename + !!new_upstream > 1)
usage_with_options(builtin_branch_usage, options);
force_create is set via OPT_FORCE as well, so we cannot remove the !! before the force_create,
hence we'd only remove it from list and unset_upstream, which are set by OPT_BOOL.
-- 8< --
From: Stefan Beller <stefanbeller@xxxxxxxxxxxxxx>
Date: Wed, 7 Aug 2013 09:32:25 +0200
Subject: [PATCH] branch, commit, name-rev: ease up boolean conditions
Now that the variables are set by OPT_BOOL, which makes sure
to have the values being 0 or 1 after parsing, we do not need
the double negation to map any other value to 1 for integer
variables.
Signed-off-by: Stefan Beller <stefanbeller@xxxxxxxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/branch.c | 3 ++-
builtin/commit.c | 2 +-
builtin/name-rev.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 4daed0b..0903763 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -872,7 +872,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (with_commit || merge_filter != NO_FILTER)
list = 1;
- if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1)
+ if (!!delete + !!rename + !!force_create + !!new_upstream +
+ list + unset_upstream > 1)
usage_with_options(builtin_branch_usage, options);
if (abbrev == -1)
diff --git a/builtin/commit.c b/builtin/commit.c
index c20426b..b0f86c8 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1072,7 +1072,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (patch_interactive)
interactive = 1;
- if (!!also + !!only + !!all + !!interactive > 1)
+ if (also + only + all + interactive > 1)
die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
if (argc == 0 && (also || (only && !amend)))
die(_("No paths with --include/--only does not make sense."));
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index a908a34..20fcf8c 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -331,7 +331,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, opts, name_rev_usage, 0);
- if (!!all + !!transform_stdin + !!argc > 1) {
+ if (all + transform_stdin + !!argc > 1) {
error("Specify either a list, or --all, not both!");
usage_with_options(name_rev_usage, opts);
}
--
1.8.4.rc0.16.g7fca822.dirty
Attachment:
signature.asc
Description: OpenPGP digital signature