diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-19 10:42:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 10:42:18 -0700 |
| commit | 52c19991cb86c81068c2ac7d8164643d8593bb50 (patch) | |
| tree | 015532c81a0eed78df8838e3d9e70804cf4ec83d /builtin/apply.c | |
| parent | 6ddc862e8bcf8c687a6fcf2a805ccb032b5d3e7f (diff) | |
| parent | 0b437a18bdd188794cec8855e2a413921d08b6e8 (diff) | |
| download | git-52c19991cb86c81068c2ac7d8164643d8593bb50.tar.gz git-52c19991cb86c81068c2ac7d8164643d8593bb50.tar.xz | |
Merge branch 'rs/logical-vs-binary-or' into maint
* rs/logical-vs-binary-or:
use logical OR (||) instead of binary OR (|) in logical context
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 3979f8bf3..0e9b631db 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) { |