mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/logical-vs-binary-or' into maint

Browse Source 
* rs/logical-vs-binary-or:
  use logical OR (||) instead of binary OR (|) in logical context
This commit is contained in:
Junio C Hamano
2013-07-19 10:42:18 -07:00
parent 6ddc862e8b 0b437a18bd
commit 52c19991cb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/apply.c
View File

@ -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) {