diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2013-08-07 09:32:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-07 08:30:30 -0700 |
| commit | 05efb7b7575dd60a5997a0f7616d0cc222c5dbf8 (patch) | |
| tree | 0559afa5de8bde8c6b1c9a94c452d8e3d517dcfe /builtin/branch.c | |
| parent | f90220755064c74e1e98d49814cb93a4ce0d0ca1 (diff) | |
| download | git-05efb7b7575dd60a5997a0f7616d0cc222c5dbf8.tar.gz | |
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>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 4daed0b230..0903763702 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) |