From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:42:18 +0000 (-0700)
Subject: Merge branch 'rs/logical-vs-binary-or' into maint
X-Git-Tag: v1.8.3.4~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52c19991cb86c81068c2ac7d8164643d8593bb50?ds=inline;hp=-c

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

* rs/logical-vs-binary-or:
use logical OR (||) instead of binary OR (|) in logical context
---

52c19991cb86c81068c2ac7d8164643d8593bb50
diff --combined builtin/apply.c
index 3979f8bf3d,faf8e30883..0e9b631db6
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@@ -906,7 -906,7 +906,7 @@@ static void parse_traditional_patch(con
  			patch->old_name = name;
  		} else {
  			patch->old_name = name;
 -			patch->new_name = xstrdup(name);
 +			patch->new_name = null_strdup(name);
  		}
  	}
  	if (!name)
@@@ -3525,7 -3525,7 +3525,7 @@@ static int check_patch(struct patch *pa
  		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) {