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>
Stefan Beller committed
Aug 7, 2013 at 09:32 UTC
05efb7b7575dd60a5997a0f7616d0cc222c5dbf8
3 files changed
+4
-3
builtin/branch.c
+2
-1
@@ -872,7 +872,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
872
if (with_commit || merge_filter != NO_FILTER)
873
list = 1;
874
875
- if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1)
875
+ if (!!delete + !!rename + !!force_create + !!new_upstream +
876
+ list + unset_upstream > 1)
877
usage_with_options(builtin_branch_usage, options);
878
879
if (abbrev == -1)
builtin/commit.c
+1
-1
@@ -1072,7 +1072,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
1072
if (patch_interactive)
1073
interactive = 1;
1074
1075
- if (!!also + !!only + !!all + !!interactive > 1)
1075
+ if (also + only + all + interactive > 1)
1076
die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
1077
if (argc == 0 && (also || (only && !amend)))
1078
die(_("No paths with --include/--only does not make sense."));
builtin/name-rev.c
+1
-1
@@ -331,7 +331,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
331
332
git_config(git_default_config, NULL);
333
argc = parse_options(argc, argv, prefix, opts, name_rev_usage, 0);
334
- if (!!all + !!transform_stdin + !!argc > 1) {
334
+ if (all + transform_stdin + !!argc > 1) {
335
error("Specify either a list, or --all, not both!");
336
usage_with_options(name_rev_usage, opts);
337
}