Skip to content

Commit 05efb7b

Browse files
stefanbellergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f902207 commit 05efb7b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

builtin/branch.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
872872
if (with_commit || merge_filter != NO_FILTER)
873873
list = 1;
874874

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)
876877
usage_with_options(builtin_branch_usage, options);
877878

878879
if (abbrev == -1)

builtin/commit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
10721072
if (patch_interactive)
10731073
interactive = 1;
10741074

1075-
if (!!also + !!only + !!all + !!interactive > 1)
1075+
if (also + only + all + interactive > 1)
10761076
die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
10771077
if (argc == 0 && (also || (only && !amend)))
10781078
die(_("No paths with --include/--only does not make sense."));

builtin/name-rev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
331331

332332
git_config(git_default_config, NULL);
333333
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) {
335335
error("Specify either a list, or --all, not both!");
336336
usage_with_options(name_rev_usage, opts);
337337
}

0 commit comments

Comments
 (0)