diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-06-13 18:19:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-13 21:47:07 (GMT) |
| commit | 0b437a18bdd188794cec8855e2a413921d08b6e8 (patch) | |
| tree | 7405fbdab450ad716441275c51cf7c2e831e02ce | |
| parent | f2b4626d9e78e00d2168a8470633d6c7f5331a13 (diff) | |
| download | git-0b437a18bdd188794cec8855e2a413921d08b6e8.zip git-0b437a18bdd188794cec8855e2a413921d08b6e8.tar.gz git-0b437a18bdd188794cec8855e2a413921d08b6e8.tar.bz2 | |
use logical OR (||) instead of binary OR (|) in logical context
The compiler can short-circuit the evaluation of conditions strung
together with logical OR operators instead of computing the resulting
bitmask with binary ORs. More importantly, this patch makes the
intent of the changed code clearer, because the logical context (as
opposed to binary context) becomes immediately obvious.
While we're at it, simplify the check for patch->is_rename in
builtin/apply.c a bit; it can only be 0 or 1, so we don't need a
comparison operator.
Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/apply.c | 2 | ||||
| -rw-r--r-- | builtin/ls-files.c | 8 | ||||
| -rw-r--r-- | builtin/merge-base.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 30eefc3..faf8e30 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3525,7 +3525,7 @@ static int check_patch(struct patch *patch) ok_if_exists = 0; if (new_name && - ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) { + ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) { int err = check_to_create(new_name, ok_if_exists); if (err && threeway) { diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 2202072..87f3b33 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -219,7 +219,7 @@ static void show_files(struct dir_struct *dir) if (show_killed) show_killed_files(dir); } - if (show_cached | show_stage) { + if (show_cached || show_stage) { for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; if ((dir->flags & DIR_SHOW_IGNORED) && @@ -233,7 +233,7 @@ static void show_files(struct dir_struct *dir) (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce); } } - if (show_deleted | show_modified) { + if (show_deleted || show_modified) { for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; struct stat st; @@ -571,8 +571,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) die("ls-files --ignored needs some exclude pattern"); /* With no flags, we default to showing the cached files */ - if (!(show_stage | show_deleted | show_others | show_unmerged | - show_killed | show_modified | show_resolve_undo)) + if (!(show_stage || show_deleted || show_others || show_unmerged || + show_killed || show_modified || show_resolve_undo)) show_cached = 1; if (max_prefix) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 1bc7991..0c4cd2f 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -107,7 +107,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0); if (!octopus && !reduce && argc < 2) usage_with_options(merge_base_usage, options); - if (is_ancestor && (show_all | octopus | reduce)) + if (is_ancestor && (show_all || octopus || reduce)) die("--is-ancestor cannot be used with other options"); if (is_ancestor) return handle_is_ancestor(argc, argv); |