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@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index 4daed0b230bdc282a2d6600866d08a9311a34c16..0903763702a436dc8b3ffc89aa64b2598e257446 100644 (file)
--- 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 (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)
                usage_with_options(builtin_branch_usage, options);
 
        if (abbrev == -1)

diff --git a/builtin/commit.c b/builtin/commit.c
index c20426b766f424d93dd603dac364ffea9fd0777f..b0f86c872b04df40296da86d1b44b1ab7790ab8e 100644 (file)
--- 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 (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."));
                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 a908a340c659e8636b975005dea22752fdeed1c9..20fcf8c696700993617649da77e5bbf6b416498a 100644 (file)
--- 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);
 
        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);
        }
                error("Specify either a list, or --all, not both!");
                usage_with_options(name_rev_usage, opts);
        }