Merge branch 'jg/status-config'

diff --git a/builtin/apply.c b/builtin/apply.c
index 30eefc3c7b390800e9452a06da18208d2fef4f11..faf8e3088340ab2787c45b0e105a600fd54e51d3 100644 (file)
--- 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) {