mirror of
https://github.com/git/git.git
synced 2025-03-15 14:31:35 +00:00
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>
This commit is contained in:
parent
f902207550
commit
05efb7b757
@ -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)
|
||||
|
@ -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."));
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user