mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'rs/logical-vs-binary-or' into maint
* rs/logical-vs-binary-or: use logical OR (||) instead of binary OR (|) in logical context
This commit is contained in:
commit
52c19991cb
|
@ -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) {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue